From 3dd561273283bcccec71ed0dcbb03c7422cd6e38 Mon Sep 17 00:00:00 2001
From: Alexander Todorov <atodorov@redhat.com>
Date: Wed, 14 Feb 2018 12:32:14 +0200
Subject: [PATCH] Fix syntax error caused by conflict resolution

---
 tests/pylorax/test_server.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/pylorax/test_server.py b/tests/pylorax/test_server.py
index 943dfab7..a3e87caa 100644
--- a/tests/pylorax/test_server.py
+++ b/tests/pylorax/test_server.py
@@ -717,4 +717,3 @@ class ServerTestCase(unittest.TestCase):
         data = json.loads(resp.data)
         self.assertNotEqual(data, None)
         self.assertEqual(data["finished"], [], "Failed to delete the failed build: %s" % data)
->>>>>>> Add tests for /compose API