Bug 1277707 et al - Follow up: fix bad rebase conflict in moz.build file; r=me
authorNick Fitzgerald <fitzgen@gmail.com>
Fri, 03 Jun 2016 11:07:29 -0700
changeset 300377 1a72dc1810bc0170754b9fbf14a79e7f855346df
parent 300376 2086e849a7e6f30fc56100f04847143d6e575ea2
child 300378 dc5692c66a028e98980527c9a637932b992874b2
push id19525
push usernfitzgerald@mozilla.com
push dateFri, 03 Jun 2016 18:07:41 +0000
treeherderfx-team@1a72dc1810bc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1277707
milestone49.0a1
Bug 1277707 et al - Follow up: fix bad rebase conflict in moz.build file; r=me
devtools/shared/specs/moz.build
--- a/devtools/shared/specs/moz.build
+++ b/devtools/shared/specs/moz.build
@@ -9,24 +9,18 @@ DevToolsModules(
     'addons.js',
     'animation.js',
     'call-watcher.js',
     'canvas.js',
     'css-properties.js',
     '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',
     'stylesheets.js',
     'webaudio.js',
     'webgl.js'
 )