From c964d95e9d383e024928d97ac33808edc1a54bbb Mon Sep 17 00:00:00 2001
From: drian0 <78469463+drian0@users.noreply.github.com>
Date: Wed, 14 Apr 2021 08:28:03 +0200
Subject: [PATCH] Merge Fix

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index d8a94516..effcf7ac 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,7 @@ connection. It's tiny too, weighing in at a lightweight about 50 MB package
 available for [Windows, Linux, Mac](https://assault.cubers.net/download.html).
 On the correct settings, it can even run on old hardware (Pentium III and above).
 
-<<<<<<< HEAD
-**Important information for Windows 10 users:**
-if you experience a mouse glitch (random camera movement), you can use the experimental [hotfix for AssaultCube 1.2.0.2 on Windows 10](https://github.com/assaultcube/AC/releases/download/v1.2.0.2/AssaultCube_v1.2.0.2_experimental_win10_hotfix_1.exe).
-Note: the hotfix **SHOULD NOT** be used to competitive play and mapping - see [known issues](https://assault.cubers.net/docs/knownissues.html).
-=======
 ![screenshot](https://user-images.githubusercontent.com/7680684/69888836-9a931d80-12b3-11ea-8123-bbf06908a96f.jpg)
->>>>>>> master
 
 ## Features in a nutshell: