From 05836e761eb8286af8a6b663b5d354945c03062d Mon Sep 17 00:00:00 2001
From: "Dax T. Games" <dtgames@kinggeek.org>
Date: Sun, 13 Oct 2019 10:11:38 -0400
Subject: [PATCH] merge

---
 CHANGELOG.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b35a6e..87c3cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,10 @@
 
 ## [Unreleased]
 
-<<<<<<< HEAD
-* Update Clink to 0.3.4
-* Fix powershell foreground color changingf to green
-=======
 * Update Clink Completions to 0.3.4
 * Fix powershell foreground color changing to green
->>>>>>> 4575ac3209f7d513504bcaf80b41ef1106c9406a
 
-## [1.3.12](https://github.com/cmderdev/cmder/tree/v1.3.11) (2019-08-18)
+## [1.3.12](https://github.com/cmderdev/cmder/tree/v1.3.12) (2019-08-18)
 
 ### Fixes