fix merge conflict

Browse Source

...

This commit is contained in:

Evgeniy Tkachenko 2017-12-22 14:43:16 +03:00 committed by GitHub

parent 9c0ebdd79c

commit 075d143a43

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

1 changed files with 1 additions and 1 deletions

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2

themes/HumHub/css/theme.css

File diff suppressed because one or more lines are too long