From 7b68ac77ab4d930e133719a441427e8b6d357781 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 3 Jul 2017 16:53:55 +1200
Subject: [PATCH] Remove obsolete branch-alias

---
 composer.json | 60 ++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/composer.json b/composer.json
index c7e44b4..7caea6a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,33 +1,29 @@
 {
-  "name": "silverstripe/installer",
-  "description": "The SilverStripe Framework Installer",
-  "require": {
-    "php": ">=5.6.0",
-    "silverstripe/admin": "1.0.x-dev",
-    "silverstripe/asset-admin": "1.0.x-dev",
-    "silverstripe/assets": "1.0.x-dev",
-    "silverstripe/campaign-admin": "1.0.x-dev",
-    "silverstripe/cms": "4.0.x-dev",
-    "silverstripe/config": "1.0.x-dev",
-    "silverstripe/errorpage": "1.0.x-dev",
-    "silverstripe/framework": "4.0.x-dev",
-    "silverstripe/graphql": "0.2.x-dev",
-    "silverstripe/reports": "4.0.x-dev",
-    "silverstripe/siteconfig": "4.0.x-dev",
-    "silverstripe/versioned": "1.0.x-dev",
-    "silverstripe-themes/simple": "~3.2.0"
-  },
-  "require-dev": {
-    "phpunit/PHPUnit": "^5.7"
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "4.0.x-dev"
-    }
-  },
-  "config": {
-    "process-timeout": 600
-  },
-  "prefer-stable": true,
-  "minimum-stability": "dev"
-}
+    "name": "silverstripe/installer",
+    "description": "The SilverStripe Framework Installer",
+    "require": {
+        "php": ">=5.6.0",
+        "silverstripe/admin": "1.0.x-dev",
+        "silverstripe/asset-admin": "1.0.x-dev",
+        "silverstripe/assets": "1.0.x-dev",
+        "silverstripe/campaign-admin": "1.0.x-dev",
+        "silverstripe/cms": "4.0.x-dev",
+        "silverstripe/config": "1.0.x-dev",
+        "silverstripe/errorpage": "1.0.x-dev",
+        "silverstripe/framework": "4.0.x-dev",
+        "silverstripe/graphql": "0.2.x-dev",
+        "silverstripe/reports": "4.0.x-dev",
+        "silverstripe/siteconfig": "4.0.x-dev",
+        "silverstripe/versioned": "1.0.x-dev",
+        "silverstripe-themes/simple": "~3.2.0"
+    },
+    "require-dev": {
+        "phpunit/PHPUnit": "^5.7"
+    },
+    "extra": [],
+    "config": {
+        "process-timeout": 600
+    },
+    "prefer-stable": true,
+    "minimum-stability": "dev"
+}
\ No newline at end of file