From 5d1bfda2a53f031f7dbb6acca14677311ba353a3 Mon Sep 17 00:00:00 2001
From: Gaia Pushbot <release+gaiajson@mozilla.com>
Date: Sun, 27 Oct 2013 20:55:23 -0700
Subject: [PATCH] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
 Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/5cffbcaff577
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #13066 from Pike/bug-930469-malformed-properties

bug 930469, malformed properties file.

========

https://hg.mozilla.org/integration/gaia-central/rev/89f65b6d853c
Author: Axel Hecht <axel@pike.org>
Desc: bug 930469, malformed properties file.
Remove leftover merge conflict marker
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index a5d24cd1cef..5bdf7295d5a 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "84806d46b65c7e226b6a9e78232b6aa69a0a8354", 
+    "revision": "5cffbcaff577ce74c28a82e1ac45e76e44eb841e", 
     "repo_path": "/integration/gaia-central"
 }