aboutsummaryrefslogtreecommitdiffstats
path: root/view/php
diff options
context:
space:
mode:
Diffstat (limited to 'view/php')
-rw-r--r--view/php/theme_init.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 509df8fef..4aecb8ecf 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -15,10 +15,7 @@ head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css');
head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css');
-<<<<<<< HEAD
head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
-=======
->>>>>>> upstream/master
head_add_js('js/jquery.js');
head_add_js('library/bootstrap/js/bootstrap.min.js');