summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Barrios Romero <eldruin@gmail.com>2018-11-13 18:39:18 +0100
committerDiego Barrios Romero <eldruin@gmail.com>2018-11-13 18:39:18 +0100
commit2c465ab14d40bfa0a10b7274825779db58636344 (patch)
treeb08f7b8c4f272576e996cadf0f019238c4acd957
parent5cce1effeab6a214850392f142aeb0fbbba3e63a (diff)
downloadads1x1x-async-2c465ab14d40bfa0a10b7274825779db58636344.tar.gz
ads1x1x-async-2c465ab14d40bfa0a10b7274825779db58636344.tar.xz
ads1x1x-async-2c465ab14d40bfa0a10b7274825779db58636344.zip
Rebase to master branch
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index ed3fb06..8b3b6ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: rust
sudo: required
before_script:
- - eval git pull --rebase https://github.com/eldruin/ads1x1x-rs ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
+ - eval git pull --rebase https://github.com/eldruin/ads1x1x-rs master
- eval git log --pretty=oneline HEAD~5..HEAD
matrix: