.

circle.yml

@@ -8,7 +8,7 @@ machine:
 
 dependencies:
   pre:
-    - sudo curl -L -o /usr/bin/docker 'http://s3-external-1.amazonaws.com/circle-downloads/docker-1.6.0-circleci'; chmod 0755 /usr/bin/docker; true
+    - sudo curl -L -o /usr/bin/docker 'http://s3-external-1.amazonaws.com/circle-downloads/docker-1.8.2-circleci'
     - sudo service docker start
     - "sudo apt-get update && sudo apt-get install -y libgmp3-dev"
 

circle.yml~

@@ -8,7 +8,7 @@ machine:
 
 dependencies:
   pre:
-    - sudo curl -L -o /usr/bin/docker 'http://s3-external-1.amazonaws.com/circle-downloads/docker-1.6.0-circleci'; chmod 0755 /usr/bin/docker; true
+    - sudo curl -L -o /usr/bin/docker 'http://s3-external-1.amazonaws.com/circle-downloads/docker-1.8.2-circleci'; chmod 0755 /usr/bin/docker; true
     - sudo service docker start
     - "sudo apt-get update && sudo apt-get install -y libgmp3-dev"
 
@@ -20,7 +20,6 @@ dependencies:
 test:
   override:
     - go test -v ./...
-<<<<<<< HEAD
 
 deployment:
   master:
@@ -29,5 +28,3 @@ deployment:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS quay.io
       - DOCKER/build.sh
       - docker push quay.io/eris/erisdb
-=======
->>>>>>> master