From 0f4b6ba3718445e17de0d56017e55ab099b6f61d Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 22 Dec 2013 15:05:56 +0100 Subject: Merge correction --- view/php/theme_init.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'view/php/theme_init.php') 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'); -- cgit v1.2.3