diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-11-29 17:40:36 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-29 17:40:36 +0100 |
| commit | 8df0b322aba3360e7ff1fdca805f93e05cda963a (patch) | |
| tree | 5ba14b375333c2b18e8d8781a7bf94a02bce26f0 | |
| parent | a512db342e71f13c51fbf1c15914e5ad3051c798 (diff) | |
| download | garage-8df0b322aba3360e7ff1fdca805f93e05cda963a.tar.gz garage-8df0b322aba3360e7ff1fdca805f93e05cda963a.zip | |
Fix merge error
| -rwxr-xr-x | script/dev-env.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/script/dev-env.sh b/script/dev-env.sh index 71fbd208..15f08e2e 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' |