Fix: scripts/code-style.sh

Author: QuinnMMcGarry

scripts/code-style.sh

@@ -20,11 +20,7 @@ set -e
 FOLDERS_TO_FORMAT=("dags" "xlml")
 
 HEAD_SHA="$(git rev-parse HEAD)"
-<<<<<<< HEAD
 BASE_BRANCH="dev"
-=======
-BASE_BRANCH="tpu-obs/dev"
->>>>>>> fdcca93 ([cienet-private] Enable workflow checks for the primary working branches)
 
 if ! git rev-parse --verify "$BASE_BRANCH" >/dev/null 2>&1; then
   git fetch origin "$BASE_BRANCH":"$BASE_BRANCH" || {