fix conflicts

This commit is contained in:
Mohit Panjwani
2020-12-03 20:35:27 +05:30
6 changed files with 953 additions and 4 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{
"/assets/js/app.js": "/assets/js/app.js?id=e2f1da81b08f2f629d38",
"/assets/js/app.js": "/assets/js/app.js?id=f8c1167e861af23971a2",
"/assets/css/crater.css": "/assets/css/crater.css?id=262352bd0c724bad8f2f"
}