Failing branch

circle.yml

@@ -9,4 +9,14 @@ dependencies:
 test:
   override:
     - docker run kostyaurysov/sample-node npm test
+<<<<<<< HEAD
 
+=======
+
+deployment:
+  production:
+    branch: master
+    commands:
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+      - ./deploy.sh
+>>>>>>> 9259cf02047c086e5fa901505b8aead903494a88

deploy.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-docker build -t kostyaurysov/sample-node .
+# docker build -t kostyaurysov/sample-node .
 docker push kostyaurysov/sample-node
 
 ssh deploy@35.187.30.81 << EOF

package.json

@@ -10,7 +10,7 @@
     "nodemon": "^1.9.1"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 0"
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
   "author": "",

server.js

@@ -4,9 +4,7 @@ var express = require("express");
 
 express()
  .get("*", function(req, res) {
-    db("users").then(function(data) {
-      res.send(data);
-    });
+    res.send("ok!");
  })
  .listen(80, function(err) {
     if (err) {