From 34eb6678d8d07b94fa0c75d3080ec469272f0dad Mon Sep 17 00:00:00 2001
From: Ingo Schommer <me@chillu.com>
Date: Mon, 10 Feb 2014 11:23:11 +1300
Subject: [PATCH] Fixed dependency errors

Probably a faulty merge from 2.4
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3f55cf91..9b7ca40a 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
 	"require": {
 		"php": ">=5.2.4",
 		"composer/installers": "*",
-		"silverstripe/framework": "2.4"
+		"silverstripe/framework": "2.5.x-dev"
 	},
 	"extra": {
 		"branch-alias": {