Removed duplicates

cwacht · Sep 8, 2012 · 2841381 · 2841381
1 parent c739466
commit 2841381
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/index.html b/index.html
@@ -38,17 +38,10 @@
 		<div id="c">Click anywhere to pause.</div>
 		<div id="d">More <a href="http://nyan.cat/" target="_blank">Nyan Cat</a>.</div>
 
-<<<<<<< HEAD
-		<script src="../js/Three.js"></script>
-		<script src="../js/Detector.js"></script>
-		<script src="../js/RequestAnimationFrame.js"></script>
-		<script src="../js/Stats.js"></script>
-=======
 		<script src="js/Three.js"></script>
 		<script src="js/Detector.js"></script>
 		<script src="js/RequestAnimationFrame.js"></script>
 		<script src="js/Stats.js"></script>
->>>>>>> gh-pages
 
 		<script>
 			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();