QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-19 11:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
satyaprakash10
2019-11-12 19:26:43 +05:30
parent 17c8225880 9192b26b9d
commit a192e2658a
56 changed files with 2428 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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