harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge correction

Browse Source
This commit is contained in:
Christian Vogeley 2013-12-22 15:05:56 +01:00
parent 0f902f94f3
commit 0f4b6ba371
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
view/php/theme_init.php
View File

@ -15,10 +15,7 @@ head_add_css('library/colorbox/colorbox.css');
head_add_css('view/css/conversation.css'); head_add_css('view/css/conversation.css');
head_add_css('view/css/bootstrap-red.css'); head_add_css('view/css/bootstrap-red.css');
head_add_css('view/css/widgets.css'); head_add_css('view/css/widgets.css');
<<<<<<< HEAD
head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css'); head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
=======
>>>>>>> upstream/master
head_add_js('js/jquery.js'); head_add_js('js/jquery.js');
head_add_js('library/bootstrap/js/bootstrap.min.js'); head_add_js('library/bootstrap/js/bootstrap.min.js');

1
view/tpl/saved_searches_aside.tpl
View File

@ -12,4 +12,3 @@
</ul> </ul>
<div class="clear"></div> <div class="clear"></div>
</div> </div>