Resolving merge issue

Author: rossops

run-unittest.sh

@@ -55,15 +55,7 @@ fi
 # docker compose exec uwsgi bash -c "python manage.py migrate dojo 0234"
 
 echo "Running docker compose unit tests with test case $TEST_CASE ..."
-<<<<<<< HEAD
-if [ ${#EXTRA_ARGS[@]} -gt 0 ]; then
-  echo "Additional arguments: ${EXTRA_ARGS[*]}"
-fi
-
-docker compose exec uwsgi bash -c "python manage.py test $TEST_CASE -v2 ${EXTRA_ARGS[*]} --keepdb"
-=======
 # Compose V2 integrates compose functions into the Docker platform, continuing to support
 # most of the  previous docker-compose features and flags. You can run Compose V2 by
 # replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
 docker compose exec uwsgi bash -c "python manage.py test $TEST_CASE -v2 --keepdb $FAIL_FAST"
->>>>>>> origin/dev