From af2b0e050b6450aec6e6a2fd4f2fa0ab8a2911eb Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Thu, 12 May 2022 20:10:50 +0800
Subject: [PATCH] fix README

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

diff --git a/README.md b/README.md
index 109a903..6c0e7c8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # RustDesk Server Program
 
-<<<<<<< HEAD
 Self-host your own RustDesk server, it is free and open source.
 
 ```
@@ -12,12 +11,3 @@ Two executables will be generated in target/release.
   - hbbr - RustDesk relay server
 
 [**Manual**](https://rustdesk.com/docs/en/self-host/)
-=======
-**Could you please also help finish below "RustDesk Self-Hosting Sever Survey"? So that we can make it better.**  https://forms.gle/9sDqAC5JBuB4b52S6
-
-If you are looking for an open source implementation, please go to [rustdesk-server-demo](https://github.com/rustdesk/rustdesk-server-demo).
-
-[Download](https://github.com/rustdesk/rustdesk-server/releases)
-
-[Doc](https://rustdesk.com/docs/en/self-host)
->>>>>>> 5043b7ce7f5a2230661381cb9c63f84c60414035