From 09b1b00509b02a5c8ba995aa0cc0b4ef93252bd3 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Mon, 19 Sep 2016 10:29:36 +0100
Subject: [PATCH] Update Changelog.md

---
 Changelog.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c1626f9..2aa228e 100755
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,5 @@
 # Changelog
 
-<<<<<<< 4834b8e4b70f5432b4029ef617d0d8d5222b950b
 ## v0.13-dev
 
 ### Added
@@ -14,10 +13,12 @@
 ### Fixed
  - Fxed huge issue with `contentonly` display mode.
 
-## v0.12.1-dev
-=======
+# v0.12.1-dev
+
+## Fixed
+ - Added error detection to `peppermint.json` loader.
+
 ## v0.12.1-beta1
->>>>>>> Re-update version
 
 ### Added
  - Added a class to the search term highlighting to aid theming (#92)