Skip to content

Commit a8d8fde

Browse files
committed
rebase fix
1 parent b4bb7fc commit a8d8fde

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

tests/Tests/ORM/Functional/Ticket/GH11149/EagerProduct.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Doctrine\Tests\ORM\Functional\Ticket\GH11149;
66

77
use Doctrine\Common\Collections\ArrayCollection;
8-
use Doctrine\Common\Collections\Collection;
98
use Doctrine\ORM\Mapping as ORM;
109

1110
/**

tests/Tests/ORM/Functional/Ticket/GH11149/Locale.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Locale
1414
{
1515
/**
1616
* @ORM\Id
17-
* @ORM\Column(type="string", length=5)
17+
* @ORM\Column(type="string")
1818
*
1919
* @var string
2020
*/

0 commit comments

Comments
 (0)