Regenerate styles and clean up merge garbage

Browse source

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>

...

This commit is contained in:

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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

alchemy/static/css/style.css

View file

File diff suppressed because one or more lines are too long