Merge pull request #38 from meedan/fix/env-file-bad-git-merge

Update .env_file
meedan · Sep 22, 2023 · 72487b0 · 72487b0
2 parents 89703cc + 7e271d9
commit 72487b0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.env_file b/.env_file
@@ -4,7 +4,3 @@ DEPLOY_ENV=local
 MODEL_NAME=audio.Model
 AWS_ACCESS_KEY_ID=SOMETHING
 AWS_SECRET_ACCESS_KEY=OTHERTHING
-<<<<<<< HEAD
-=======
-
->>>>>>> master