From 7a543e02325c5b6821bab4693604d674b3285de3 Mon Sep 17 00:00:00 2001
From: Davor Runje <davor@airt.ai>
Date: Mon, 11 Nov 2024 10:34:49 +0000
Subject: [PATCH] resolve merge conflict

---
 scripts/test_cookiecutter.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/test_cookiecutter.sh b/scripts/test_cookiecutter.sh
index 8dc9705..7f239dd 100755
--- a/scripts/test_cookiecutter.sh
+++ b/scripts/test_cookiecutter.sh
@@ -19,11 +19,8 @@ cd generated/$1-$2-$3/my_fastagency_app && pip install -e .[dev] && cd ../../..
 # Initialize git in the generated project(needed for pre-commit)
 echo -e "\033[32mInitializing git in the generated project\033[0m"
 cd generated/$1-$2-$3/my_fastagency_app && git init && git add . && cd ../../..
-<<<<<<< HEAD
 # uncomment this for debugging
 # cd generated/$1-$2-$3/my_fastagency_app && git commit -m "init" --no-verify && cd ../../..
-=======
->>>>>>> origin/main
 
 # Run pre-commit
 echo -e "\033[32mRunning pre-commit\033[0m"