RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 14:31:40 +03:00
Code Issues Projects Releases Wiki Activity

remove wrong conflit mark

Browse Source
This commit is contained in:
Fabio B. Silva 2012-04-21 01:59:25 -03:00
parent 5c7d7c6f05
commit fa140d8f59
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
View File

@ -463,7 +463,6 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
} }
/** /**
<<<<<<< HEAD
* @group DDC-889 * @group DDC-889
* @expectedException Doctrine\ORM\Mapping\MappingException * @expectedException Doctrine\ORM\Mapping\MappingException
* @expectedExceptionMessage Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class. * @expectedExceptionMessage Class "Doctrine\Tests\Models\DDC889\DDC889Class" sub class of "Doctrine\Tests\Models\DDC889\DDC889SuperClass" is not a valid entity or mapped super class.
@ -487,7 +486,6 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
} }
/** /**
<<<<<<< HEAD
* @group DDC-1663 * @group DDC-1663
*/ */
public function testNamedNativeQuery() public function testNamedNativeQuery()