From fbaa39ab748afe922049e4ad4b1f56ab4a8b65e1 Mon Sep 17 00:00:00 2001
From: Luke Robles <98352913+lrobles-iterable@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:34:22 -0800
Subject: [PATCH] Removing the sync conflict file

---
 .gitignore                                          |  3 ++-
 ...cBook-Pro.local's conflicted copy 2022-02-08).sh | 13 -------------
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 test-dragon-bot (Lukes-MacBook-Pro.local's conflicted copy 2022-02-08).sh

diff --git a/.gitignore b/.gitignore
index 59d20d85..bf8f1e97 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ dragon_bot_env
 __pycache__
 *.csv
 *env
-*sync*
\ No newline at end of file
+*conflict*
+
diff --git a/test-dragon-bot (Lukes-MacBook-Pro.local's conflicted copy 2022-02-08).sh b/test-dragon-bot (Lukes-MacBook-Pro.local's conflicted copy 2022-02-08).sh
deleted file mode 100644
index c9a44067..00000000
--- a/test-dragon-bot (Lukes-MacBook-Pro.local's conflicted copy 2022-02-08).sh	
+++ /dev/null
@@ -1,13 +0,0 @@
-# Remove the running container so we cna re-use the container name 'dragon-bot'
-printf "\n[-] Formatting code\n"
-./format_code.sh
-printf "[+] Done\n"
-
-printf "\n[-] Deleting old dragon-bot container from system\n"
-docker rm -f dragon-bot-test
-printf "[+] Done\n"
-
-printf "\n[-] Running dragon bot in test mode\n"
-docker build -f ./Dockerfile-test-env -t dragon-bot-test . || exit
-
-docker run -ti -v $(pwd)/app:/app --rm --name dragon-bot-test -e DRAGON_ENV=test -e token="MzQ1MjkwMTI5OTQ4Mjc4Nzg0.DG5IBw._9umb82PrL22bPe7GjmHClU-NtU" dragon-bot-test sh