Also work with Doctrine 2.4

doctrine · Jan 24, 2015 · 8e37af1 · 8e37af1
1 parent 16df260
commit 8e37af1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -8,7 +8,6 @@
    It also reintroduces the DoctrineModule\Form\Element\ObjectSelect behavior of v0.7.0, that permitted to set an ObjectSelect on an entity's attribute when no association was defined (OneToMany etc.)
    [#272](https://github.com/doctrine/DoctrineORMModule/pull/272)
  * The required PHP version is bumped to `5.3.23` [#306](https://github.com/doctrine/DoctrineORMModule/pull/306)
- * Doctrine ORM minimal version is bumped to `2.5`
  * Add support for second level cache (see docs about how to configure it)
 
 # 0.8.0

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -66,7 +66,6 @@ return array(
 )
 ```
 
-<<<<<<< HEAD
 ### How to enable and configure second-level cache
 
 ```php
@@ -99,7 +98,6 @@ return array(
 
 You also need to add the `Cache` annotation to your model ([read more](http://doctrine-orm.readthedocs.org/en/latest/reference/second-level-cache.html#entity-cache-definition)).
 
-=======
 ### Set a custom default repository
 
 ```php
@@ -112,7 +110,6 @@ You also need to add the `Cache` annotation to your model ([read more](http://do
 )
 ```
 
->>>>>>> cf1bf47c9d06044ed676aced685fa74dda50dc00
 ### How to Use Two Connections
 
 ```php