Resolve conflicts
This commit is contained in:
2
dist/css/AdminLTE.css
vendored
2
dist/css/AdminLTE.css
vendored
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.3.8
|
||||
* AdminLTE v2.3.12
|
||||
* Author: Almsaeed Studio
|
||||
* Website: Almsaeed Studio <http://almsaeedstudio.com>
|
||||
* License: Open source - MIT
|
||||
|
||||
2
dist/css/AdminLTE.min.css
vendored
2
dist/css/AdminLTE.min.css
vendored
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.3.8
|
||||
* AdminLTE v2.3.12
|
||||
* Author: Almsaeed Studio
|
||||
* Website: Almsaeed Studio <http://almsaeedstudio.com>
|
||||
* License: Open source - MIT
|
||||
|
||||
Reference in New Issue
Block a user