Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-09 15:46:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed extraneous merge conflict marker

Browse Source
This commit is contained in:
hillct 2016-12-01 03:20:22 -05:00 committed by GitHub
parent 84f8cd0661
commit 968ec73aea
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -69,15 +69,12 @@ Try the [interactive tutorial](http://gun.js.org/think.html) in the browser (**5
docker build -t myrepo/gundb:v1 . docker build -t myrepo/gundb:v1 .
docker run -p 8080:8080 myrepo/gundb:v1 docker run -p 8080:8080 myrepo/gundb:v1
``` ```
<<<<<<< HEAD
=======
- Or, if you prefer your Docker image with metadata labels (Linux/Mac only): - Or, if you prefer your Docker image with metadata labels (Linux/Mac only):
```bash ```bash
npm run docker npm run docker
docker run -p 8080:8080 usenameHere/gun:git docker run -p 8080:8080 usenameHere/gun:git
``` ```
>>>>>>> 6b78b2ee91fc3442fe0976812db868cdd49b4709
Then visit [http://localhost:8080](http://localhost:8080) in your browser. Then visit [http://localhost:8080](http://localhost:8080) in your browser.
### [Heroku](https://www.heroku.com/) ### [Heroku](https://www.heroku.com/)