From 00d56902ad6c3e3ab6d2aa90410f8b674c06e0e3 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Fri, 11 Mar 2016 11:12:25 -0500
Subject: [PATCH] No bug - Fix busted merge conflict resolution on a CLOSED
 TREE.

---
 dom/media/tests/mochitest/mochitest.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini
index fb580b768c4e..47a236aecb23 100644
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
 # Android 2.3 - bug 981881
 tags = msg webrtc
-<<<<<<< local
 subsuite = media
 skip-if = android_version == '10' || (buildapp == 'mulet') || (toolkit == 'gonk' && debug) # b2g(Either bug 1171118 or bug 1169838, take your pick)
 support-files =