Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing carriage return to attempt to try to avoid merge conflict in github UI

This commit is contained in:
Robbt 2018-01-08 18:47:21 -05:00
parent 25066afb37
commit c8ba866484
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/views/scripts/playlist/update.phtml
View File

@ -2,7 +2,6 @@
$items = $this->contents; $items = $this->contents;
$isSmartBlock = ($this->obj instanceof Application_Model_Block); $isSmartBlock = ($this->obj instanceof Application_Model_Block);
$isPlaylist = ($this->obj instanceof Application_Model_Playlist); $isPlaylist = ($this->obj instanceof Application_Model_Playlist);
if (count($items) && ($isSmartBlock || $isPlaylist)) : ?> if (count($items) && ($isSmartBlock || $isPlaylist)) : ?>
<?php $i = 0; ?> <?php $i = 0; ?>
<?php foreach($items as $item) : <?php foreach($items as $item) :