Resolve scripts/utils.sh

scripts/utils.sh

@@ -29,10 +29,7 @@ setup_db() {
     if [ "$GITLAB_DATABASE" = "mysql" ]; then
         bundle exec rake add_limits_mysql
     fi
-<<<<<<< HEAD
 
     # EE-only
     bundle exec rake geo:db:drop geo:db:create geo:db:schema:load geo:db:migrate
-=======
->>>>>>> upstream/master
 }