Removing carriage return to attempt to try to avoid merge conflict in github UI
This commit is contained in:
parent
25066afb37
commit
c8ba866484
|
@ -2,7 +2,6 @@
|
|||
$items = $this->contents;
|
||||
$isSmartBlock = ($this->obj instanceof Application_Model_Block);
|
||||
$isPlaylist = ($this->obj instanceof Application_Model_Playlist);
|
||||
|
||||
if (count($items) && ($isSmartBlock || $isPlaylist)) : ?>
|
||||
<?php $i = 0; ?>
|
||||
<?php foreach($items as $item) :
|
||||
|
|
Loading…
Reference in New Issue