Corrected issues with merge of 2.x changes

This commit is contained in:
Shelby Sanders 2014-08-04 20:09:07 -07:00
parent 9693150c8b
commit 1a96d84035
2 changed files with 4 additions and 1 deletions

View File

@ -23,4 +23,5 @@
/*
FIXME: Separate the overrides from the rest of the styles, rather than override screen.css entirely.
*/
*/

View File

@ -61,3 +61,5 @@ $(function() {
}
}
});