Resolving conflicts

techfromsage · Aug 24, 2015 · bf3837e · bf3837e
2 parents 1147a6f + cb9b59d
commit bf3837e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/test/unit/mongo/MongoTripodDriverTest.php b/test/unit/mongo/MongoTripodDriverTest.php
@@ -2085,3 +2085,4 @@ class TestSaveChangesHookB extends TestSaveChangesHookA
 {
     // empty
 }
+/** END: saveChangesHooks tests */