From d921e775298d541b55b62e2b67f24458bbf5fe47 Mon Sep 17 00:00:00 2001
From: Rokin <web@rokin.in>
Date: Sat, 31 Mar 2018 23:13:25 +0200
Subject: [PATCH] Update README

---
 README.md | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 506a5ad..35f3797 100644
--- a/README.md
+++ b/README.md
@@ -48,22 +48,16 @@ wget -qO- https://raw.githubusercontent.com/Rokin05/darkine-kde/master/install.s
 
 ## Configuration
 
-<<<<<<< HEAD
-<p align="center"><img src="https://raw.githubusercontent.com/Rokin05/darkine-kde/master/INFO/screenshots/thumbs/mini.lockscreen.png" alt="Darkine-KDE lockscreen"/></p>
-=======
 
->>>>>>> 4bee60c32feaa55110d3a7e44cf927c42f54c50c
+<p align="center"><img src="https://raw.githubusercontent.com/Rokin05/darkine-kde/master/INFO/screenshots/thumbs/mini.lockscreen.png" alt="Darkine-KDE lockscreen"/></p>
 #### Set the background lockscreen dark-grey :
 ```
 kwriteconfig5 --file kscreenlockerrc --group Greeter --group Wallpaper --group org.kde.color --group General --key Color 29,29,29
 qdbus org.kde.KWin /KWin reconfigure
 ```
 
-<<<<<<< HEAD
-<p align="center"><img src="https://raw.githubusercontent.com/Rokin05/darkine-kde/master/INFO/screenshots/thumbs/mini.fonts.png" alt="Darkine-KDE fonts"/></p>
-=======
 
->>>>>>> 4bee60c32feaa55110d3a7e44cf927c42f54c50c
+<p align="center"><img src="https://raw.githubusercontent.com/Rokin05/darkine-kde/master/INFO/screenshots/thumbs/mini.fonts.png" alt="Darkine-KDE fonts"/></p>
 #### Use the same <a href="https://raw.githubusercontent.com/Rokin05/darkine-kde/master/INFO/screenshots/fonts-config.png">fonts</a> from the screenshot :
 ```
 # Arch :
@@ -82,11 +76,8 @@ qdbus org.kde.KWin /KWin reconfigure
 kquitapp5 plasmashell && kstart5 plasmashell
 ```
 
-<<<<<<< HEAD
-<p align="center"><img src="https://raw.githubusercontent.com/Rokin05/darkine-kde/master/INFO/screenshots/thumbs/mini.kvantum.png" alt="Darkine-KDE kvantum"/></p>
-=======
 
->>>>>>> 4bee60c32feaa55110d3a7e44cf927c42f54c50c
+<p align="center"><img src="https://raw.githubusercontent.com/Rokin05/darkine-kde/master/INFO/screenshots/thumbs/mini.kvantum.png" alt="Darkine-KDE kvantum"/></p>
 #### Arch : How install Kvantum :
 <a href="https://github.com/tsujan/Kvantum/blob/master/Kvantum/INSTALL">Official guide</a> - can be change over the time ! :
 ```