From 7bef3226e9d7e19272126dea113474a62ee63f25 Mon Sep 17 00:00:00 2001
From: Yorick <ephase@xieme-art.org>
Date: Thu, 21 Jan 2016 15:22:32 +0100
Subject: [PATCH] README corrections

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 41c6307..3c62200 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ and cut your Little Pony head.
  * Add privilege elevation error when the script is not launched with Administrator's rights
  * Add the possibility to use arguments when calling the script (then ps script could be call from
  another script)
-<<<<<<< HEAD
  * ~~Update the windows update list to hide kb that aren't yet listed~~ 
  * ~~Speed up hide_update~~  
  * **Tell me**