From 79ee52db0546bdf5473953f9383fbd8fd181b064 Mon Sep 17 00:00:00 2001
From: Jack Amadeo <jamadeo@gmail.com>
Date: Fri, 8 Nov 2024 11:55:24 -0500
Subject: [PATCH] fix conflict

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 9a862f9..48198f9 100644
--- 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
 
 ```