From 26ec73fde8f65cd234cfa450e7d816a0e7a2cee0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 2 Jun 2013 20:38:13 +0200
Subject: [PATCH] Fixed composer.json (merge error)

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c22d8ee..1973e31 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,8 @@
 	},
 	"extra": {
 		"branch-alias": {
-		"dev-master": "3.2.x-dev"
+			"dev-master": "3.2.x-dev"
+		}
 	},
 	"scripts": {
 		"post-install-cmd": "php ./framework/cli-script.php dev/build",