give up and let travis *try* and push all commits

basarat · Oct 23, 2016 · 21b6d27 · 21b6d27
1 parent 0632891
commit 21b6d27
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,5 +25,4 @@ deploy:
   api_key:
     secure: oNTLrikDPcsDP7zAZrClovGrlEo+Zf9BOYqhI8VekqXW+TijY0l0QpLCwaB4soEtCdHqP8VPfu6DwJJ8hvwxpaKNr3Lr4S2DA2mKLsy5Ro4hau/b65tXUZ8ZEvKCTnHZa7PCtHemxhqc7Tul5O3L9pqr8nl8ZtJFwMSbxjtNjwvZzEPlwN1kvnsZ4qU6/Fph19MlDvHLI1No8K523FMBN2PcnS3xOQyZK2Hn6Jk/MwldGSQ4OSE3wwLiEsvJ2uAwtbyoZlvLbJNMl9r1qgoGB6VTzulgEP0NY81ksuz2MZip7nz9W2aw8yWL2iN7mTBCCXHwP8ec1y5ojI3P+LH2gbB3ec96P8WBN9NHMOBhMPcH8rKZkkGm6K5L5c9QttiDmoL2Aj5tBj+Xgq1L1+qO3pDSn6LbKAnHvpR77iUhnZA7m1CPLAMV0E8XzZGWnthMCEjq+cqdrP4lUxqowdYwbF/fgSCueE8JCsWEIlZA9arHrYMqJxLjr8CNrN9jgo99jba0KeT23j1NEeGZItLi+AbtebU06IKiyEqk+6yw3LGJZbswwjchzVImWtHVgiBtowvGzZDz2fuj6makmJLhoQKznvnzuZXi5JoBxQ4v/Qi6pneTfB2Je9k4gW/4RQT1GqgchkChozHl8R/3U10V09dU7jFFgrVmfBu/tJ8g+Qc=
   on:
-    tags: true
     repo: basarat/byots
diff --git a/release.sh b/release.sh
@@ -13,7 +13,6 @@ git status
 # Commit,tag,push,publish
 echo "Committing"
 git commit -m "$commitName"
-git merge HEAD@{1}
 echo "Pushing commit"
 git push