From c8ba86648465f14a7f1958bdafe6fb0ddbc18e83 Mon Sep 17 00:00:00 2001
From: Robbt <robbt@azone.org>
Date: Mon, 8 Jan 2018 18:47:21 -0500
Subject: [PATCH] Removing carriage return to attempt to try to avoid merge
 conflict in github UI

---
 airtime_mvc/application/views/scripts/playlist/update.phtml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index 8f60a3eff..a1dbc8824 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -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) :