no bug - Fix merge conflict to help open this CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Tue, 04 Nov 2014 20:56:45 -0800
changeset 214049 f739be112bf1b96c991222822faf2c60ff5e2bfb
parent 214048 9351fa0d14a29eb7e2ca80467747b4376a36c3b1
child 214050 c12d13fb6570c6eb52d136407f0a955ccbc46c6c
push id27771
push userryanvm@gmail.com
push dateWed, 05 Nov 2014 19:04:24 +0000
treeherdermozilla-central@305b4fecce99 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
no bug - Fix merge conflict to help open this CLOSED TREE
dom/interfaces/base/nsIDOMWindowUtils.idl
--- a/dom/interfaces/base/nsIDOMWindowUtils.idl
+++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
@@ -46,21 +46,17 @@ interface nsIDOMClientRect;
 interface nsIURI;
 interface nsIDOMEventTarget;
 interface nsIRunnable;
 interface nsICompositionStringSynthesizer;
 interface nsITranslationNodeList;
 interface nsIJSRAIIHelper;
 interface nsIContentPermissionRequest;
 
-<<<<<<< local
-[scriptable, uuid(01e0c3ca-37e7-4ab4-bd22-3e99d8d23336)]
-=======
 [scriptable, uuid(e293355b-ae7f-4ef7-9237-452bcf3e9e6b)]
->>>>>>> other
 interface nsIDOMWindowUtils : nsISupports {
 
   /**
    * Image animation mode of the window. When this attribute's value
    * is changed, the implementation should set all images in the window
    * to the given value. That is, when set to kDontAnimMode, all images
    * will stop animating. The attribute's value must be one of the
    * animationMode values from imgIContainer.