From 510a36a2b2a91f8bffecf0723e8c5fe0b75e33e5 Mon Sep 17 00:00:00 2001
From: Elliott Dicus <ewdicus@gmail.com>
Date: Wed, 20 Mar 2013 21:58:10 -0700
Subject: [PATCH] Removed merge conflict tags from Detector

---
 src/pixi/utils/Detector.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/pixi/utils/Detector.js b/src/pixi/utils/Detector.js
index b0937d3..8d1d5a5 100644
--- a/src/pixi/utils/Detector.js
+++ b/src/pixi/utils/Detector.js
@@ -15,21 +15,17 @@ PIXI.autoDetectRenderer = function(width, height, view)
 {
 	if(!width)width = 800;
 	if(!height)height = 600;
-	
+
 	// BORROWED from Mr Doob (mrdoob.com)
-	var webgl = ( function () { try { return !! window.WebGLRenderingContext && !! document.createElement( 'canvas' ).getContext( 'experimental-webgl' ); } catch( e ) { return false; } } )()
-	
+	var webgl = ( function () { try { return !! window.WebGLRenderingContext && !! document.createElement( 'canvas' ).getContext( 'experimental-webgl' ); } catch( e ) { return false; } } )();
+
 	//console.log(webgl);
 	if( webgl )
 	{
-<<<<<<< HEAD
-		return new PIXI.WebGLRenderer(width, height, view) 
-=======
-		return new PIXI.WebGLRenderer(width, height, view)  
->>>>>>> Interactivity Added
+		return new PIXI.WebGLRenderer(width, height, view);
 	}
-	
+
 	return	new PIXI.CanvasRenderer(width, height, view);
-}
+};