Bug 1488573 - Fix merge conflict with inbound. r=me a=ebalazs
authorEmilio Cobos Álvarez <emilio@crisal.io>
Wed, 26 Sep 2018 15:56:15 +0200
changeset 494025 48cc597db296
parent 494024 32fb34059762
child 494026 62308095ad0d
child 494040 635cf6a1a1fb
child 494077 034e167ff3ab
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, ebalazs
bugs1488573
milestone64.0a1
first release with
nightly win32
48cc597db296 / 64.0a1 / 20180926142037 / files
nightly win64
48cc597db296 / 64.0a1 / 20180926142055 / files
nightly linux32
nightly linux64
nightly mac
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win32
nightly win64
Bug 1488573 - Fix merge conflict with inbound. r=me a=ebalazs The patch in this bug conflicted with: https://hg.mozilla.org/integration/mozilla-inbound/rev/1679bd50f32813a7725d5e34853daa42717fa833
gfx/vr/gfxVROculus.cpp
--- a/gfx/vr/gfxVROculus.cpp
+++ b/gfx/vr/gfxVROculus.cpp
@@ -2025,21 +2025,17 @@ VRSystemManagerOculus::ScanForController
       switch (activeControllerArray[i]) {
         case ovrControllerType::ovrControllerType_LTouch:
           hand = GamepadHand::Left;
           break;
         case ovrControllerType::ovrControllerType_RTouch:
           hand = GamepadHand::Right;
           break;
         default:
-<<<<<<< working copy
           continue;
-=======
-          break;
->>>>>>> merge rev
       }
       RefPtr<VRControllerOculus> oculusController = new VRControllerOculus(hand,
                                                       mDisplay->GetDisplayInfo().GetDisplayID());
       mOculusController.AppendElement(oculusController);
 
       // Not already present, add it.
       AddGamepad(oculusController->GetControllerInfo());