Permalink
Browse files

couple of merge conflicts stayed in

  • Loading branch information...
1 parent 180c017 commit b448639e5e838caeb2fa8f66d9f7e75602233fbd scottjehl committed May 31, 2011
Showing with 2 additions and 17 deletions.
  1. +2 −13 test/test.css
  2. +0 −4 test/unit/test.css
View
@@ -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.
View
@@ -58,8 +58,4 @@
#testelem {
width: 500px;
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> Added support for logical NOT. Added test cases. Seems to work in limited testing.

0 comments on commit b448639

Please sign in to comment.