TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/css/crater.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/assets/js/app.js
View File

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json
View File

@ -1,4 +1,4 @@
{ {
"/assets/js/app.js": "/assets/js/app.js?id=e211851ed84790fee286", "/assets/js/app.js": "/assets/js/app.js?id=18ab14612ee75948e8c1",
"/assets/css/crater.css": "/assets/css/crater.css?id=2123fdc939165f025e3b" "/assets/css/crater.css": "/assets/css/crater.css?id=6ecada5a53e8e4db8b2b"
} }

2
resources/assets/js/views/settings/CompanyInfo.vue
View File

@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<avatar-cropper <avatar-cropper
:labels="{ submit: 'submit', cancel: 'Cancle'}" :labels="{ submit: 'Submit', cancel: 'Cancel'}"
:cropper-options="cropperOptions" :cropper-options="cropperOptions"
:output-options="cropperOutputOptions" :output-options="cropperOutputOptions"
:output-quality="0.8" :output-quality="0.8"

2
resources/assets/js/views/settings/UserProfile.vue
View File

@ -23,7 +23,7 @@
</div> </div>
</div> </div>
<avatar-cropper <avatar-cropper
:labels="{ submit: 'submit', cancel: 'Cancle'}" :labels="{ submit: 'Submit', cancel: 'Cancel'}"
:cropper-options="cropperOptions" :cropper-options="cropperOptions"
:output-options="cropperOutputOptions" :output-options="cropperOutputOptions"
:output-quality="0.8" :output-quality="0.8"

2
resources/assets/js/views/wizard/CompanyInfo.vue
View File

@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<avatar-cropper <avatar-cropper
:labels="{ submit: 'submit', cancel: 'Cancle'}" :labels="{ submit: 'Submit', cancel: 'Cancel'}"
:cropper-options="cropperOptions" :cropper-options="cropperOptions"
:output-options="cropperOutputOptions" :output-options="cropperOutputOptions"
:output-quality="0.8" :output-quality="0.8"