From 28e8c226001a255dfe8c57bf8d7913364f617a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Wed, 21 Jan 2015 22:38:59 +0100
Subject: [PATCH] swtich back to doctrine/orm 2.4

---
 composer.json | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 035026967..3e647e63a 100644
--- a/composer.json
+++ b/composer.json
@@ -22,18 +22,15 @@
         "symfony/framework-bundle": "2.5.*",
         "symfony/yaml": "2.5.*",
         "symfony/symfony": "2.5.*",
-        "doctrine/dbal": "2.5.*@dev",
-        "doctrine/orm": "2.5.*@dev",
-        "doctrine/common": "2.4.*@dev",
-        "doctrine/doctrine-bundle": "~1.2@dev",
-        "chill-project/main": "dev-master",
-        "chill-project/custom-fields": "dev-master",
-        "chill-project/person": "dev-master"
-    },
-    "require-dev": {
+        "doctrine/dbal": "~2.5",
+        "doctrine/orm": "~2.4",
+        "doctrine/common": "~2.4",
+        "doctrine/doctrine-bundle": "~1.2",
         "chill-project/main": "dev-master@dev",
         "chill-project/custom-fields": "dev-master@dev",
-        "chill-project/person": "dev-master@dev",
+        "chill-project/person": "dev-master@dev"
+    },
+    "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "fzaninotto/faker": "~1"
     }