From d529593caa6c42a03f8e0140cbd5d59aae711ac2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 11 Jun 2015 18:41:49 -0700
Subject: [PATCH] Bumping manifests a=b2g-bump

---
 b2g/config/emulator/sources.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 9726bbbe3742..3cecaea18b8b 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,13 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-<<<<<<< /home/vliu/projs/checkin-area/mozilla-b2g34_v2_1s/b2g/config/emulator/sources.xml.orig
   <project name="gaia.git" path="gaia" remote="mozillaorg" revision="90463896d22b564fdd3202a97ff941e6cdc502ae"/>
-||||||| /tmp/sources.xml~base.NdaNTQ
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2304a1f6327c2ccf35d6995ee16f2231ed1f22a3"/>
-=======
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f8b848c82d1ed589f7a1eb5cc099830c867ff1d4"/>
->>>>>>> /tmp/sources.xml~other.wRO2Ah
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="a3920f79cf34086d72567c1bf851ce8675ef3a4d"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="cd88d860656c31c7da7bb310d6a160d0011b0961"/>
-- 
2.11.4.GIT