fix conflit

2017-08-29 18:42:08 +06:30
parent f03d8654e7 e84c080552
commit 5fcfbdc020
16 changed files with 2965 additions and 15 deletions
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -8,6 +8,7 @@
@import "dataTables/jquery.dataTables";
@import "daterangepicker-bs3";
@import "select2";
+@import "bootstrap-datetimepicker";

 /* Show it is fixed to the top */
 // body {
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -4,6 +4,8 @@
@import "jquery-ui";
@import "bootstrap-datepicker3";

+@import "jquery.datetimepicker";
+
 /* Show it is fixed to the top */
 // body {
 //   min-height: 75rem;