fix conflicts

Browse Source

...

This commit is contained in:

Mohit Panjwani

2020-01-06 14:48:08 +05:30

parent 53e2ed253f 50957fc179

commit 09e335a8a7

6 changed files with 7 additions and 7 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

public/assets/css/crater.css vendored

File diff suppressed because one or more lines are too long

2

public/assets/js/app.js

File diff suppressed because one or more lines are too long