From 2703a2b27c278cbd33f3916140e71ce861716324 Mon Sep 17 00:00:00 2001
From: Guilherme Blanco <guilhermeblanco@gmail.com>
Date: Mon, 18 Jun 2012 15:23:12 -0400
Subject: [PATCH] Fixed issue with merge.

---
 lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php b/lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
index 41cdc03d0..4d88a6ba4 100644
--- a/lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
+++ b/lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
@@ -15,13 +15,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * This software consists of voluntary contributions made by many individuals
-<<<<<<< HEAD:lib/Doctrine/ORM/Query/AST/JoinVariableDeclaration.php
- * and is licensed under the MIT license. For more information, see
- * <http://www.phpdoctrine.org>.
-=======
  * and is licensed under the LGPL. For more information, see
  * <http://www.doctrine-project.org>.
->>>>>>> Updated PoC for multiple components DQL support.:lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
  */
 
 namespace Doctrine\ORM\Query\AST;