Removed merge conflicts

Author: photonstorm

src/cameras/2d/Camera.js

@@ -156,7 +156,7 @@ var Camera = new Class({
 
         /**
          * Is this Camera visible or not?
-         * 
+         *
          * A visible camera will render and perform input tests.
          * An invisible camera will not render anything and will skip input tests.
          *
@@ -1265,14 +1265,14 @@ var Camera = new Class({
 
     /**
      * Sets the visibility of this Camera.
-     * 
+     *
      * An invisible Camera will skip rendering and input tests of everything it can see.
      *
      * @method Phaser.Cameras.Scene2D.Camera#setVisible
      * @since 3.10.0
      *
      * @param {boolean} value - The visible state of the Camera.
-     * 
+     *
      * @return {this} This Camera instance.
      */
     setVisible: function (value)