From 7eb9d559ba9f45c2bcc79eb68f0168237c859e9b Mon Sep 17 00:00:00 2001
From: Tom Hutchison <Hutchy68@gmail.com>
Date: Fri, 11 Dec 2020 11:27:50 -0500
Subject: [PATCH] Reset for develop branch, v2.3.1-dev

---
 CHANGELOG.md | 7 +++----
 skin.json    | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04bfd31..f64d3e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,11 @@
-<<<<<<< HEAD
-=======
-# Version 2.3.0
+## Version 2.3.1-dev
+
+## Version 2.3.0
 * [compatibility, CSS] Load MW core CSS that was dropped in MW 1.35
 * [code] Drop Travis-CI and move to CircleCI
 * [code] Update php-parallel-lint to a supported branch with PHP 8.0
 * [deprecated, code] Updated deprecated code
 
->>>>>>> master
 ## Version 2.2.2
 * [bug, enhancement] Fix to allow multiple methods of login such as MW-OAuth2Client - Issue #99
 * [bug, enhancement] Left-menu search (on mobile widths only) doesn't auto-complete #98
diff --git a/skin.json b/skin.json
index 6277922..a115589 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
 {
 	"name": "Pivot",
-	"version": "2.3.0",
+	"version": "2.3.1-dev",
 	"author": [
 		"Tom Hutchison",
 		"..."