mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-23 17:27:51 -07:00
bca82684a1
# Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # public/css/build/all.css # public/css/dist/all.css # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json
33 lines
2.1 KiB
JSON
33 lines
2.1 KiB
JSON
{
|
|
<<<<<<< HEAD
|
|
"/js/app.js": "/js/app.js?id=be43e3109667a86c9a02",
|
|
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f7a5d783fef321018f4c",
|
|
"/css/build/app.css": "/css/build/app.css?id=0dfc05b0fe1dcc9b6e3d",
|
|
"/css/all.css": "/css/all.css?id=9399418f7ce5805e3571",
|
|
"/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
|
|
"/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
|
|
"/css/skins/skin-green-dark.min.css": "/css/skins/skin-green-dark.min.css?id=1039ae0e198a7f3d8da7",
|
|
"/css/skins/skin-orange-dark.min.css": "/css/skins/skin-orange-dark.min.css?id=9a461970f7ab07f40847",
|
|
"/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795",
|
|
"/css/signature-pad.css": "/css/signature-pad.css?id=6a89d3cd901305e66ced",
|
|
"/css/signature-pad.min.css": "/css/signature-pad.min.css?id=6a89d3cd901305e66ced",
|
|
"/js/vendor.js": "/js/vendor.js?id=8bf903b80600aa42a9cb",
|
|
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=bc5e33610f678021cc48",
|
|
"/js/dist/bootstrap-table-simple-view.js": "/js/dist/bootstrap-table-simple-view.js?id=3926b8f4aaad6ca20d31",
|
|
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=6b4ccfd094c065f065ae"
|
|
=======
|
|
"/js/build/vue.js": "/js/build/vue.js?id=96f90510b797ac27a94b",
|
|
"/css/AdminLTE.css": "/css/AdminLTE.css?id=5e72463a66acbcc740d5",
|
|
"/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
|
|
"/css/overrides.css": "/css/overrides.css?id=2d81c3704393bac77011",
|
|
"/js/build/vue.js.map": "/js/build/vue.js.map?id=423f16f63b86abd6b196",
|
|
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=0be7790b84909dca6a0a",
|
|
"/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
|
|
"/css/overrides.css.map": "/css/overrides.css.map?id=f7ce9ca49027594ac402",
|
|
"/css/dist/all.css": "/css/dist/all.css?id=98db4e9b7650453c8b00",
|
|
"/js/dist/all.js": "/js/dist/all.js?id=114f1025a1b3e8975476",
|
|
"/css/build/all.css": "/css/build/all.css?id=98db4e9b7650453c8b00",
|
|
"/js/build/all.js": "/js/build/all.js?id=114f1025a1b3e8975476"
|
|
>>>>>>> hotfixes/2fa_qr
|
|
}
|