RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-06 15:29:26 +03:00
Code Issues Projects Releases Wiki Activity

Fixed issue with merge.

Browse Source
This commit is contained in:
Guilherme Blanco 2012-06-18 15:23:12 -04:00
parent 41d9f612c7
commit 2703a2b27c
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
View File

@ -15,13 +15,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* This software consists of voluntary contributions made by many individuals * 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 * and is licensed under the LGPL. For more information, see
* <http://www.doctrine-project.org>. * <http://www.doctrine-project.org>.
>>>>>>> Updated PoC for multiple components DQL support.:lib/Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
*/ */
namespace Doctrine\ORM\Query\AST; namespace Doctrine\ORM\Query\AST;