Regenerate styles and clean up merge garbage

Sucky thing about minified files is that they are a pain in the ass
for merge conflicts.

Signed-off-by: Alan Orth <alan.orth@gmail.com>
main
Alan Orth 2014-10-30 16:48:50 +03:00
parent 44977f33f3
commit e7d8ebb489
No known key found for this signature in database
GPG Key ID: 0FB860CC9C45B1B9
1 changed files with 1 additions and 2 deletions

File diff suppressed because one or more lines are too long