Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests

Conflicts: airtime_mvc/tests/application/models/ShowTest.php
2014-01-13 12:00:16 -05:00 · 2014-01-13 12:00:16 -05:00 · a658dbf27c
parent 8457a3403b 0f4099e481
commit a658dbf27c
1 changed files with 1 additions and 2 deletions
--- a/airtime_mvc/tests/application/models/ShowTest.php
+++ b/airtime_mvc/tests/application/models/ShowTest.php
@ -160,8 +160,7 @@ class ShowTest extends Zend_Test_PHPUnit_DatabaseTestCase
        );
    }

-    /* Tests that a show instance gets deleted from it's repeating sequence
-     * properly
+    /* Tests that a show instance gets deleted from it's repeating sequence properly
     */
    public function testDeleteShowInstance()
    {