Resolve conflicts

This commit is contained in:
Abdullah Almsaeed
2017-05-18 08:11:54 -04:00
5 changed files with 66 additions and 6 deletions

View File

@@ -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

View File

@@ -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