Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Fix join-poc merge #379

Closed
wants to merge 1 commit into from

3 participants

Fabio B. Silva Don't Add Me To Your Organization a.k.a The Travis Bot Guilherme Blanco
Fabio B. Silva
Owner

No description provided.

Don't Add Me To Your Organization a.k.a The Travis Bot

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

Guilherme Blanco
Owner

Already fixed... =) 2703a2b

Guilherme Blanco guilhermeblanco closed this June 18, 2012
Fabio B. Silva FabioBatSilva deleted the branch January 17, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Jun 18, 2012
Fabio B. Silva fix join-poc merge a01bf66
This page is out of date. Refresh to see the latest.
7  lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
... ...
@@ -1,7 +1,5 @@
1 1
 <?php
2 2
 /*
3  
- *  $Id$
4  
- *
5 3
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6 4
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
7 5
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -15,13 +13,8 @@
15 13
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16 14
  *
17 15
  * This software consists of voluntary contributions made by many individuals
18  
-<<<<<<< HEAD:lib/Doctrine/ORM/Query/AST/JoinVariableDeclaration.php
19 16
  * and is licensed under the MIT license. For more information, see
20  
- * <http://www.phpdoctrine.org>.
21  
-=======
22  
- * and is licensed under the LGPL. For more information, see
23 17
  * <http://www.doctrine-project.org>.
24  
->>>>>>> Updated PoC for multiple components DQL support.:lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
25 18
  */
26 19
 
27 20
 namespace Doctrine\ORM\Query\AST;
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.