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:
satyaprakash10
2019-11-12 19:39:59 +05:30
parent a192e2658a
commit 0d4714082c
3 changed files with 0 additions and 18557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18550
public/assets/css/laraspace.css vendored
View File

File diff suppressed because it is too large Load Diff

1
public/assets/css/laraspace.css.map
View File

File diff suppressed because one or more lines are too long

6
resources/assets/sass/base.scss vendored
View File

@ -111,13 +111,7 @@ code, .code {
justify-content: center;
align-items: center;
}
<<<<<<< HEAD
.swal-icon--custom {
height: 50px !important;
}
=======
.swal-icon--custom {
height: 50px !important;
}
>>>>>>> 9192b26b9da40898dd5213b7b4257bde662f4a6b