From 8643bdc9d7dce4a2b3e734bedb91336dbd00e64c Mon Sep 17 00:00:00 2001 From: Ayane Satomi Date: Fri, 13 Sep 2019 00:48:09 +0800 Subject: [PATCH] fix further conflicts in README.md Signed-off-by: Ayane Satomi --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 30263d47..04378411 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,6 @@ docker run -it -p 127.0.0.1:8080:8080 -v "$PWD:/home/coder/project" codercom/cod ![Screenshot](/doc/assets/ide.gif) ## Getting Started -<<<<<<< HEAD -======= - -[![Create a Droplet](./doc/assets/do-new-droplet-btn.svg)](https://marketplace.digitalocean.com/apps/code-server?action=deploy) - ->>>>>>> master ### Run over SSH Use [sshcode](https://github.com/codercom/sshcode) for a simple setup. @@ -131,13 +125,8 @@ Our changes include: [MIT](LICENSE) ## Enterprise -<<<<<<< HEAD Visit [our enterprise page](https://coder.com/enterprise) for more information about our enterprise offering. -======= - -Visit [our website](https://coder.com/) for more information about our enterprise offering. ->>>>>>> master ## Commercialization If you would like to commercialize code-server, please contact