Resolve conflict in PR #3372

Browse Source

...

This commit is contained in:

Frederic Guillot

2017-11-15 15:10:54 -08:00

parent 765cb42725

commit 7d678780c1

2 changed files with 4 additions and 1 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

2

assets/css/app.min.css vendored

File diff suppressed because one or more lines are too long