Skip to content
Permalink
Browse files

Clearing end of file conflict.

  • Loading branch information...
InfosecGene committed Mar 5, 2018
1 parent 7a3291c commit c4653691f8b50e6d81e60c8745129e4bc2cc5ac0
Showing with 1 addition and 2 deletions.
  1. +1 −2 tests/TestCase/ORM/QueryTest.php
@@ -3700,5 +3700,4 @@ public function testSelectAllExceptThrowsInvalidArgument()
$this->assertTrue(true);
}
}
}
}

0 comments on commit c465369

Please sign in to comment.
You can’t perform that action at this time.