Remove merge conflict markers.

jsha · jsha · commit a56cd57397de · 2015-08-13T10:41:27.000-07:00
diff --git a/src/chrome/content/rules/Stack-Exchange.xml b/src/chrome/content/rules/Stack-Exchange.xml
@@ -1,19 +1,7 @@
 <!--
-<<<<<<< HEAD
-	For rules causing false/broken MCB, Stack-Exchange-mixedcontent.xml.
-
-
-	Other Stack Exchange rulesets:
-
-		- Ask_Ubuntu.com.xml
-		- MathOverflow.net.xml
-		- Server_Fault.com.xml
-
-=======
 	This ruleset aims to cover all sites in the Stackexchange family
 	
 	For rules causing false/broken MCB, see Stack-Exchange-mixedcontent.xml
->>>>>>> 783d04068f6f0f8568590e6332a23a7ce94c9430
 
 	Problematic domains:
 
