fix conflict

neptyneco · Nov 8, 2024 · 79ee52d · 79ee52d
1 parent e995d86
commit 79ee52d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -8,12 +8,8 @@ The easiest way to get started is to use the docker image. This will give you a
 
 ```shell
 
-<<<<<<< Updated upstream
-docker-compose up -d
-=======
 docker compose up -d
 docker logs neptyne-spreadsheet-neptyne-1
->>>>>>> Stashed changes
 
 ```