From a6667754b4a8d7c5ffff8759e9f5f54c8cc7a3b9 Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Tue, 8 Sep 2020 08:43:58 +0200 Subject: [PATCH 1/2] Remove obsolete branch alias Signed-off-by: Geert Eltink --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index 8ca0701..9176b24 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,6 @@ "config": { "sort-packages": true }, - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev", - "dev-develop": "2.1.x-dev" - } - }, "require": { "php": "^7.1", "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7", From 6bd4dbabf307a70a166e4e8271c4548c3f9d05b8 Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Tue, 8 Sep 2020 08:44:14 +0200 Subject: [PATCH 2/2] Cleanup changelog Signed-off-by: Geert Eltink --- CHANGELOG.md | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d620e40..1377bac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,50 +2,6 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.1.0 - TBD - -### Added - -- Nothing. - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - -## 2.0.2 - TBD - -### Added - -- Nothing. - -### Changed - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 2.0.1 - 2020-07-02 ### Added