a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve tree conflicts with master 

Signed-off-by: Ayane Satomi <chinodesuuu@gmail.com>
This commit is contained in:
Ayane Satomi 2019-09-13 00:38:18 +08:00
parent 0e1fed3c24 64cc2895f3
commit 5b51999df7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -18,6 +18,12 @@ docker run -it -p 127.0.0.1:8080:8080 -v "$PWD:/home/coder/project" codercom/cod
![Screenshot](/doc/assets/ide.gif) ![Screenshot](/doc/assets/ide.gif)
## Getting Started ## 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 ### Run over SSH
Use [sshcode](https://github.com/codercom/sshcode) for a simple setup. Use [sshcode](https://github.com/codercom/sshcode) for a simple setup.
@ -125,8 +131,13 @@ Our changes include:
[MIT](LICENSE) [MIT](LICENSE)
## Enterprise ## Enterprise
<<<<<<< HEAD
Visit [our enterprise page](https://coder.com/enterprise) for more information Visit [our enterprise page](https://coder.com/enterprise) for more information
about our enterprise offering. about our enterprise offering.
=======
Visit [our website](https://coder.com/) for more information about our enterprise offering.
>>>>>>> master
## Commercialization ## Commercialization
If you would like to commercialize code-server, please contact If you would like to commercialize code-server, please contact