- removed commit reference in validation file

marellocommerce · Jun 15, 2020 · 125bbe8 · 125bbe8
1 parent 1c0060e
commit 125bbe8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/Marello/Bundle/CustomerBundle/Resources/config/validation.yml b/src/Marello/Bundle/CustomerBundle/Resources/config/validation.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Marello\Bundle\CustomerBundle\Entity\Customer:
     properties:
         firstName: