Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1277707 et al - Follow up: fix bad rebase conflict in moz.build file; r=me

Browse Source
This commit is contained in:
Nick Fitzgerald 2016-06-03 11:07:29 -07:00
parent 175bca873e
commit 92e4e4537f
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devtools/shared/specs/moz.build
View File

@ -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',