Merge correction

2013-12-22 15:05:56 +01:00 · 2013-12-22 15:05:56 +01:00 · 0f4b6ba371
commit 0f4b6ba371
parent 0f902f94f3
2 changed files with 0 additions and 4 deletions
--- 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');
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@ -12,4 +12,3 @@
 	</ul>
 	<div class="clear"></div>
 </div>
-