From fa140d8f594e11cc5ec45604350a3c97ebd6355d Mon Sep 17 00:00:00 2001 From: "Fabio B. Silva" Date: Sat, 21 Apr 2012 01:59:25 -0300 Subject: [PATCH] remove wrong conflit mark --- tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index e83a9dbc2..7d44417c3 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -463,7 +463,6 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase } /** -<<<<<<< HEAD * @group DDC-889 * @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. @@ -487,7 +486,6 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase } /** -<<<<<<< HEAD * @group DDC-1663 */ public function testNamedNativeQuery()