From 4cd166a1115fe4ade5875d938da82bdad143d4b9 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 11 Dec 2012 17:59:19 +0100
Subject: [PATCH] Updated composer.json

---
 composer.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 19fb9c41..bd190e10 100644
--- a/composer.json
+++ b/composer.json
@@ -18,12 +18,7 @@
 	"require": {
 		"php": ">=5.3.2",
 		"composer/installers": "*",
-		"silverstripe/framework": "dev-master"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "3.1.x-dev"
-		}
+		"silverstripe/framework": "3.1.x-dev"
 	},
 	"autoload": {
 		"classmap": ["tests/behat/"]