[tor-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1

[mikeperry at torproject.org]

commit 5d524cb311ca7b7d107dd042c1025251314516df
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Oct 9 10:44:53 2014 +0000

    fixup! Merge remote-tracking branch 'gk/bug_13027' into tor-browser-31.1.1esr-4.x-1
---
 dom/workers/test/mochitest.ini |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini
index 0275195..1cfdca9 100644
--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@@ -157,12 +157,5 @@ skip-if = buildapp == 'b2g' || e10s
 skip-if = (os == "win") || (os == "mac") || toolkit == 'android' || e10s #bug 798220
 [test_url_exceptions.html]
 [test_urlSearchParams.html]
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 [test_bug1060621.html]
 [test_bug1062920.html]
->>>>>>> Bug 1062920 - WorkerNavigator strings should honor general.*.override prefs. r=khuey, a=sledru
-=======
-[test_bug1060621.html]
->>>>>>> Bug 1060621 - WorkerScope should CC mLocation and mNavigator. r=bz, a=sledru