From 1ad0c9c75f0c497465b466907f7851b34c599ae7 Mon Sep 17 00:00:00 2001
From: "yohei.naruse" <ny150621@gmail.com>
Date: Wed, 9 Nov 2016 00:37:16 +0900
Subject: [PATCH] fix errors

---
 tests/models/test_queries.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/models/test_queries.py b/tests/models/test_queries.py
index 085bf7db..19c24b80 100644
--- a/tests/models/test_queries.py
+++ b/tests/models/test_queries.py
@@ -51,8 +51,6 @@ class TestApiKeyGetByObject(BaseTestCase):
         self.assertEqual(forked_table.name, "Table")
         self.assertEqual(forked_table.description, "")
         self.assertEqual(forked_table.options, "{}")
-<<<<<<< HEAD
-=======
 
     def test_fork_from_query_that_has_no_visualization(self):
         # prepare original query and visualizations
@@ -71,4 +69,4 @@ class TestApiKeyGetByObject(BaseTestCase):
 
         self.assertEqual(count_table, 1)
         self.assertEqual(count_vis, 1)
->>>>>>> fix bugs
+