No bug - Fix busted merge conflict resolution on a CLOSED TREE.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 11 Mar 2016 11:12:25 -0500
changeset 288231 946ed22cad04431c75ab5093989dfedf1bae5a3e
parent 288230 f907faa919be95dd411706b0c69a1acad340f81d
child 288232 208f5bf7bfb28a415bbfcb836d3174cf0f622b36
child 288246 fd24de5fb7db406838f419b4780f809cf012e0a1
child 288290 c8b421423059068586d436fb7fbab9be5059faf5
push id30076
push userryanvm@gmail.com
push dateFri, 11 Mar 2016 16:13:08 +0000
treeherdermozilla-central@946ed22cad04 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone48.0a1
first release with
nightly linux32
946ed22cad04 / 48.0a1 / 20160312030405 / files
nightly linux64
946ed22cad04 / 48.0a1 / 20160312030405 / files
nightly mac
946ed22cad04 / 48.0a1 / 20160312030405 / files
nightly win32
946ed22cad04 / 48.0a1 / 20160312030405 / files
nightly win64
946ed22cad04 / 48.0a1 / 20160312030405 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
No bug - Fix busted merge conflict resolution on a CLOSED TREE.
dom/media/tests/mochitest/mochitest.ini
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -1,12 +1,11 @@
 [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 =
   head.js
   dataChannel.js
   mediaStreamPlayback.js
   network.js
   nonTrickleIce.js