From c13b24fb40f5261f5004de94287a588b3ecf5874 Mon Sep 17 00:00:00 2001
From: Casper da Costa-Luis <casper.dcl@physics.org>
Date: Tue, 21 Jan 2020 19:50:22 +0000
Subject: [PATCH] fix master/edge release provider argument conflicts

---
 .travis.yml                  | 2 +-
 scripts/ci/before_install.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1bb1d8607..46643ae1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -135,7 +135,7 @@ deploy:
       stage: build
   - provider: snap
     snap: dvc_*.snap
-    channel: $SNAP_CHANNEL
+    channel: $RELEASE_SNAP_CHANNEL
     skip_cleanup: true
     on:
       all_branches: true
diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh
index 2e9461be4..bf0f1b4c9 100644
--- a/scripts/ci/before_install.sh
+++ b/scripts/ci/before_install.sh
@@ -52,7 +52,7 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 fi
 
 if [[ -n "$TRAVIS_TAG" ]]; then
-    echo "export SNAP_CHANNEL=stable" >> env.sh
+    echo "export RELEASE_SNAP_CHANNEL=stable" >> env.sh
 else
-    echo "export SNAP_CHANNEL=edge" >> env.sh
+    echo "export RELEASE_SNAP_CHANNEL=edge" >> env.sh
 fi