fixed merge

examples/webgl_geometry_terrain_raycast.html

@@ -252,14 +252,8 @@
 
 			function onMouseMove( event ) {
 
-<<<<<<< HEAD
-				mouse.x = ( ( event.clientX * window.devicePixelRatio ) / renderer.domElement.width ) * 2 - 1;
-				mouse.y = - ( ( event.clientY * window.devicePixelRatio ) / renderer.domElement.height ) * 2 + 1;
-
-=======
 				mouse.x = ( event.clientX / renderer.domElement.clientWidth ) * 2 - 1;
 				mouse.y = - ( event.clientY / renderer.domElement.clientHeight ) * 2 + 1;
->>>>>>> d865453bf872fe15e2f417d4fa598dab2164cae7
 				raycaster.setFromCamera( mouse, camera );
 
 				// See if the ray from the camera into the world hits one of our meshes
@@ -280,4 +274,4 @@
 		</script>
 
 	</body>
-</html>
+</html>