From 0ac3bb3668f2a96801bc196ab3828a052107b8aa Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 17 Nov 2016 10:15:58 +1300
Subject: [PATCH] Remove obsolete branch-alias

---
 composer.json | 67 ++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/composer.json b/composer.json
index a454113..343b54f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,36 @@
 {
-	"name": "silverstripe/fulltextsearch",
-	"description": "Adds support for Fulltext Search engines like Sphinx and Solr to SilverStripe CMS",
-	"type": "silverstripe-module",
-	"keywords": ["silverstripe", "sphinx", "solr", "fulltext"],
-	"authors": [
-		{
-			"name": "Hamish Friedlander",
-			"email": "hamish@silverstripe.com"
-		},
-		{
-			"name": "Damian Mooyman",
-			"email": "damian@silverstripe.com",
+    "name": "silverstripe/fulltextsearch",
+    "description": "Adds support for Fulltext Search engines like Sphinx and Solr to SilverStripe CMS",
+    "type": "silverstripe-module",
+    "keywords": [
+        "silverstripe",
+        "sphinx",
+        "solr",
+        "fulltext"
+    ],
+    "authors": [
+        {
+            "name": "Hamish Friedlander",
+            "email": "hamish@silverstripe.com"
+        },
+        {
+            "name": "Damian Mooyman",
+            "email": "damian@silverstripe.com",
             "role": "Developer"
-		}
-	],
-	"require": {
-		"silverstripe/framework": "~3.1",
-		"monolog/monolog": "~1.15"
-	},
-	"require-dev": {
-		"silverstripe/cms": "~3.1",
-		"hafriedlander/silverstripe-phockito": "*"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.3.x-dev"
-		}
-	},
-	"suggest": {
-		"silverstripe/fulltextsearch-localsolr": "Adds a ready-to-use local Solr server for initial development"
-	},
-	"minimum-stability": "dev",
-	"license": "BSD-3-Clause"
-}
+        }
+    ],
+    "require": {
+        "silverstripe/framework": "~3.1",
+        "monolog/monolog": "~1.15"
+    },
+    "require-dev": {
+        "silverstripe/cms": "~3.1",
+        "hafriedlander/silverstripe-phockito": "*"
+    },
+    "extra": [],
+    "suggest": {
+        "silverstripe/fulltextsearch-localsolr": "Adds a ready-to-use local Solr server for initial development"
+    },
+    "minimum-stability": "dev",
+    "license": "BSD-3-Clause"
+}
\ No newline at end of file