Merge branch 'cc-4961-show-linking' of dev.sourcefabric.org:airtime into cc-4961-show-linking

Conflicts: airtime_mvc/application/services/ScheduleService.php airtime_mvc/application/services/ShowInstanceService.php airtime_mvc/application/services/ShowService.php
2013-03-08 11:24:54 -05:00 · 2013-03-08 11:24:54 -05:00 · 846e940f82
parent 4a86da5f87 c7203aa40d
commit 846e940f82
1 changed files with 1 additions and 1 deletions
--- a/airtime_mvc/application/services/ShowInstanceService.php
+++ b/airtime_mvc/application/services/ShowInstanceService.php
@ -175,6 +175,6 @@ class Application_Service_ShowInstanceService

    private function deleteRebroadcastShowInstances()
    {
-        
+
    }
 }