Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove merge conflict in readme #21

Closed
wants to merge 1 commit into from
Closed

Remove merge conflict in readme #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove merge conflict in readme
  • Loading branch information
@clach04
clach04 committed Jul 17, 2022
commit 207e8212148ed97e1ef4a0b4d41175308c28aff1
4 changes: 0 additions & 4 deletions docs/install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ You can download a [zip of the most recent release](https://github.com/FoxUSA/St
## Option 2: Using `docker`
`docker run -d -p 8080:80 foxusa/storedown`

<<<<<<< HEAD
## Option 3: Using `docker-compose`
=======
## Option 3: Using docker-compose
>>>>>>> master
> If you want to use SSL/TLS skip this and go down to that section
>
Put the following text in a `docker-compose.yml`.
Expand Down