From 3e83a29587d93f3f5882177597e51d629cf7ef9c Mon Sep 17 00:00:00 2001
From: Shane Perry <sperry@protonmail.com>
Date: Tue, 6 Jun 2017 07:15:41 -0500
Subject: [PATCH] Updates Changelog to 0.1.3

---
 CHANGELOG | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 94cbaa0..7f3ac43 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,9 +5,10 @@
 * Huge speedup by caching ldap
 
 [0.1.2]
-<<<<<<< HEAD
-* Uses syncthing generated config
-* Bumps to version 0.14.28
-=======
 * Fixed wrong URL
->>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
+
+[0.1.3]
+* Uses syncthing generated config
+* Bumps to version 0.14.29
+
+