a

hugoesthere · Apr 12, 2014 · 30ef17e · 30ef17e
1 parent bb3618b
commit 30ef17e
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/templates/homepage.html b/templates/homepage.html
@@ -24,20 +24,16 @@
 </head>
 <body>
 	<h1>5Cribs</h1>
-<<<<<<< HEAD
-	<a href="searchbox.html"><img src="http://i.imgur.com/vAIQxqY.jpg"></img></a> <!--Pomona-->
-=======
+
 </br>
 	<a href="pomona-full-campus.html"><img src="http://i.imgur.com/RDbahRz.png"></img></a> <!--Pomona-->
->>>>>>> FETCH_HEAD
+
 </br>
 	<a href="search"><img src="http://i.imgur.com/0k9q7cO.png"></img></a> <!--Scripps-->
 </br>
-<<<<<<< HEAD
-	<a href="search"><img src="http://i.imgur.com/TYs4GUQ.jpg"></img></a> <!--CMC-->
-=======
+
 	<a href="pomona-full-campus.html"><img src="http://i.imgur.com/25LjUp0.png"></img></a> <!--CMC-->
->>>>>>> FETCH_HEAD
+
 </br>
 </br>
 	<a href="search"><img src="http://i.imgur.com/shtpbQk.png"></img></a> <!--Mudd-->