From 2650c61b8613db182f019aedbc828680b5420a4d Mon Sep 17 00:00:00 2001
From: fhdk <fh@uex.dk>
Date: Sun, 1 Apr 2018 14:18:20 +0200
Subject: [PATCH] updated changelog

---
 CHANGELOG.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b157fe50..04efad0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-<<<<<<< HEAD
 ## [4.10.0] 2018-03-25
-* Added  : Implemented issue [#128](https://github.com/manjaro/pacman-mirrors/issues/128)
-=======
-## [4.10.0] 2018-03-27
-* Added  : [#128](https://github.com/manjaro/pacman-mirrors/issues/128) `-s/--no-status` Allow mirror list with not up-to-date mirrors
->>>>>>> no-status-branch
+* Added       : Implemented issue [#128](https://github.com/manjaro/pacman-mirrors/issues/128)
+* Description : `-s/--no-status` Allow mirror list with not up-to-date mirrors
 
 ## [4.9.1] 2018-03-23
 * Fixed  : [#130](https://github.com/manjaro/pacman-mirrors/issues/130) Mirror list generation could result in weird destinations if user selected multiple protocols from same mirror.
-- 
GitLab