diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 15:05:56 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 15:05:56 +0100 |
| commit | 0f4b6ba3718445e17de0d56017e55ab099b6f61d (patch) | |
| tree | 47885cbe2de7b076300805476d4f941565657dc5 | |
| parent | 0f902f94f30dabaa962be082e7eb4a7402fe5670 (diff) | |
| download | volse-hubzilla-0f4b6ba3718445e17de0d56017e55ab099b6f61d.tar.gz volse-hubzilla-0f4b6ba3718445e17de0d56017e55ab099b6f61d.tar.bz2 volse-hubzilla-0f4b6ba3718445e17de0d56017e55ab099b6f61d.zip | |
Merge correction
| -rw-r--r-- | view/php/theme_init.php | 3 | ||||
| -rwxr-xr-x | view/tpl/saved_searches_aside.tpl | 1 |
2 files changed, 0 insertions, 4 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'); diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index c670ee3fa..615eca39d 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -12,4 +12,3 @@ </ul> <div class="clear"></div> </div> - |