From 8df0b322aba3360e7ff1fdca805f93e05cda963a Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 29 Nov 2020 17:40:36 +0100 Subject: [PATCH] Fix merge error --- script/dev-env.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/script/dev-env.sh b/script/dev-env.sh index 71fbd20..15f08e2 100755 --- a/script/dev-env.sh +++ b/script/dev-env.sh @@ -6,7 +6,6 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" -<<<<<<< HEAD export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1` export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` export AWS_DEFAULT_REGION='garage'