Browse Source

fix README

rustdesk 3 years ago
parent
commit
af2b0e050b
1 changed files with 0 additions and 10 deletions
  1. 0 10
      README.md

+ 0 - 10
README.md

@@ -1,6 +1,5 @@
1 1
 # RustDesk Server Program
2 2
 
3
-<<<<<<< HEAD
4 3
 Self-host your own RustDesk server, it is free and open source.
5 4
 
6 5
 ```
@@ -12,12 +11,3 @@ Two executables will be generated in target/release.
12 11
   - hbbr - RustDesk relay server
13 12
 
14 13
 [**Manual**](https://rustdesk.com/docs/en/self-host/)
15
-=======
16
-**Could you please also help finish below "RustDesk Self-Hosting Sever Survey"? So that we can make it better.**  https://forms.gle/9sDqAC5JBuB4b52S6
17
-
18
-If you are looking for an open source implementation, please go to [rustdesk-server-demo](https://github.com/rustdesk/rustdesk-server-demo).
19
-
20
-[Download](https://github.com/rustdesk/rustdesk-server/releases)
21
-
22
-[Doc](https://rustdesk.com/docs/en/self-host)
23
->>>>>>> 5043b7ce7f5a2230661381cb9c63f84c60414035