Repairing conflicts

weblab · Sep 8, 2014 · 3c432c3 · 3c432c3
2 parents 041f48e + 6744363
commit 3c432c3
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/style.scss b/style.scss
@@ -405,9 +405,6 @@ table .external .glyphicon-new-window {
 	}
 }
 
-<<<<<<< HEAD
-=======
-
 /*
 	 Profile Page
 */
@@ -447,5 +444,4 @@ table .external .glyphicon-new-window {
 	}
 	.uup-mailing-address {
 	}	
-}
->>>>>>> FETCH_HEAD
+}