Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix join-poc merge #379

Closed
wants to merge 1 commit into from

3 participants

@FabioBatSilva

No description provided.

@travisbot

This pull request fails (merged a01bf66 into 41d9f61).

@guilhermeblanco

Already fixed... =) 2703a2b

@FabioBatSilva FabioBatSilva deleted the FabioBatSilva:join-poc-merge branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 18, 2012
  1. @FabioBatSilva

    fix join-poc merge

    FabioBatSilva authored
This page is out of date. Refresh to see the latest.
Showing with 0 additions and 7 deletions.
  1. +0 −7 lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
View
7 lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -15,13 +13,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;
Something went wrong with that request. Please try again.