Fix conflicts

cakephp · Jun 27, 2019 · d9759e8 · d9759e8
1 parent bbcd96c
commit d9759e8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/tests/comparisons/Model/testBakeAssociationDetectionCategoriesTable.php b/tests/comparisons/Model/testBakeAssociationDetectionCategoriesTable.php
@@ -62,12 +62,7 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-<<<<<<< HEAD
-            ->requirePresence('name', 'create')
             ->notEmptyString('name');
-=======
-            ->allowEmptyString('name', false);
->>>>>>> master
 
         return $validator;
     }

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionOldProductsTable.php b/tests/comparisons/Model/testBakeAssociationDetectionOldProductsTable.php
@@ -54,12 +54,7 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-<<<<<<< HEAD
-            ->requirePresence('name', 'create')
             ->notEmptyString('name');
-=======
-            ->allowEmptyString('name', false);
->>>>>>> master
 
         return $validator;
     }

diff --git a/tests/comparisons/Model/testBakeAssociationDetectionProductsTable.php b/tests/comparisons/Model/testBakeAssociationDetectionProductsTable.php
@@ -66,12 +66,7 @@ public function validationDefault(Validator $validator)
         $validator
             ->scalar('name')
             ->maxLength('name', 100)
-<<<<<<< HEAD
-            ->requirePresence('name', 'create')
             ->notEmptyString('name');
-=======
-            ->allowEmptyString('name', false);
->>>>>>> master
 
         return $validator;
     }