fixes bad merge

schmittjoh · Jan 4, 2014 · 9464194 · 9464194
1 parent 4f585a3
commit 9464194
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
@@ -66,7 +66,4 @@
 require_once __DIR__.'/../AttributeOverride.php';
 require_once __DIR__.'/../AttributeOverrides.php';
 require_once __DIR__.'/../EntityListeners.php';
-<<<<<<< HEAD
-=======
 require_once __DIR__.'/../Cache.php';
->>>>>>> 69cad4079dcfbee273e7451ee6361a82c2432afb