couple of merge conflicts stayed in

scottjehl · May 31, 2011 · b448639 · b448639
1 parent 180c017
commit b448639
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/test/test.css b/test/test.css
@@ -42,18 +42,11 @@ a {
 }
 
 
-<<<<<<< HEAD
+
 
 /*styles for 620px and up! (let's try this one minified )*/
 @media screen and (min-width: 620px),only print,projector{body{background:red;}}
-=======
+
-/*styles for 620px and up!*/
-@media screen and (min-width: 620px), only print, projection {
-	body {
-		background: red;
-	}
-}
->>>>>>> Added support for logical NOT. Added test cases. Seems to work in limited testing.
 
 /*styles for 800px and up!*/
 @media screen and (min-width: 800px){
@@ -74,8 +67,4 @@ a {
 	body {
 		background: navy;
 	}
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> Added support for logical NOT. Added test cases. Seems to work in limited testing.
diff --git a/test/unit/test.css b/test/unit/test.css
@@ -58,8 +58,4 @@
 	#testelem {
 		width: 500px;
 	}
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> Added support for logical NOT. Added test cases. Seems to work in limited testing.