Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander
DONTBUILD

--HG--
extra : amend_source : 32264340bdabf2c66e71967e1f33158b9a5f5cde
Bug 981941: avoid showing the "save password" notification for about:accounts, r=dolske

--HG--
extra : rebase_source : b42551fb1ce0f12983cce62a81c589600f77dc31
Bug 982167: adjust layout of Sync pref pane so that checkboxes don't span the entire width of the prefpane, r=smacleod

--HG--
extra : rebase_source : c05e5568d4e6f693033e83c9b4afe13077826401