From 92e4e4537f305895f25175562d60c85144c7fede Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Fri, 3 Jun 2016 11:07:29 -0700
Subject: [PATCH] Bug 1277707 et al - Follow up: fix bad rebase conflict in
 moz.build file; r=me

---
 devtools/shared/specs/moz.build | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/devtools/shared/specs/moz.build b/devtools/shared/specs/moz.build
index 41a2061c1721..519794e3bd4f 100644
--- a/devtools/shared/specs/moz.build
+++ b/devtools/shared/specs/moz.build
@@ -14,15 +14,9 @@ DevToolsModules(
     'heap-snapshot-file.js',
     'highlighters.js',
     'inspector.js',
-<<<<<<< HEAD
-<<<<<<< HEAD
     'node.js',
-=======
-=======
     'preference.js',
->>>>>>> 2b386d5... Bug 1277717 - Decouple the PreferenceFront from the PreferenceActor; r=ejpbruel
     'settings.js',
->>>>>>> e4a75c4... Bug 1277715 - Decouple the SettingsFront from the SettingsActor; r=ejpbruel
     'storage.js',
     'styleeditor.js',
     'styles.js',