From 78083afe38a45f236ab525894db80d8c0028af70 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Tue, 20 Sep 2016 02:03:28 +0200 Subject: [PATCH] Undo accidential dev->next-minor merge Turns out there is a difference between hg and git and I should not switch that often. --- Changelog.md | 8 -------- config/defaults.yml | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8271a41fd..5493395b5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,11 +1,3 @@ -# 0.7.0.0 - -## Refactor - -## Bug fixes - -## Features - # 0.6.1.0 ## Refactor diff --git a/config/defaults.yml b/config/defaults.yml index 8fc69122d..2c9046f6a 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -4,7 +4,7 @@ defaults: version: - number: "0.6.99.0" # Do not touch unless doing a release, do not backport the version number that's in master + number: "0.6.0.99" # Do not touch unless doing a release, do not backport the version number that's in master heroku: false environment: url: "http://localhost:3000/"