commit e8003f3c412a502c8dc33541a0a10181f567d8c9
author Jim Shaver <dcypherd@gmail.com> Tue May 05 22:14:01 2015 -0400
committer Jim Shaver <dcypherd@gmail.com> Tue May 05 22:14:01 2015 -0400
tree b052ceb05c8f824b14b4dfb081d6127137335c6d
parent a89af1ac7bf090a42f63b9b40ee1d074b8c0adac

fix final merge of .travis.yml

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index bf88756..0354895 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,19 +56,11 @@
   - language: generic
     os: osx
     env: TOXENV=py27
-<<<<<<< HEAD
   - env: TOXENV=py26-cryptographyMaster
   - env: TOXENV=py27-cryptographyMaster
   - env: TOXENV=py33-cryptographyMaster
   - env: TOXENV=py34-cryptographyMaster
   - env: TOXENV=pypy-cryptographyMaster
-=======
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy
->>>>>>> e667f0a8af5717d82671c406fc55621f4010301e
   - env: OPENSSL=0.9.8 TOXENV=py27
 
 install: