mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 07:15:13 +00:00
Merge correction
This commit is contained in:
parent
0f902f94f3
commit
0f4b6ba371
2 changed files with 0 additions and 4 deletions
|
@ -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');
|
||||
|
|
|
@ -12,4 +12,3 @@
|
|||
</ul>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue