fix conflict due to whitespace in css.g
authorMilian Wolff <mail@milianw.de>
Thu, 5 Aug 2010 16:44:49 +0000 (18:44 +0200)
committerMilian Wolff <mail@milianw.de>
Thu, 5 Aug 2010 16:44:49 +0000 (18:44 +0200)
commitb85678650cfc264637e9411bb47b782540efba45
tree7ab610f62e8a4fbf0a98f6b73ea1d0f11a278957
parente536d205fe5aa994dd1127acc500c2321cbd7cf8
fix conflict due to whitespace in css.g
languages/css/parser/css.g