Fix syntax error caused by conflict resolution

2018-02-14 12:32:14 +02:00 · 2018-02-14 12:32:14 +02:00 · 3dd5612732
parent 64ce465285
commit 3dd5612732
1 changed files with 0 additions and 1 deletions
--- 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