Fix merge errors and node tests

This commit is contained in:
Luke Page
2014-08-14 18:03:59 +01:00
parent f85f253586
commit ddba055461
3 changed files with 3 additions and 2 deletions

View File

@@ -1,5 +1,5 @@
#import {
color: #ff0000;
color: red;
}
@media (min-width: 600px) {
#css { color: yellow; }