Merge branch 'unittests' of github.com:sourcefabric/Airtime into unittests
Conflicts: airtime_mvc/tests/application/models/ShowTest.php
This commit is contained in:
commit
a658dbf27c
|
@ -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()
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue