remove maxDiff

optimizely · May 28, 2017 · 0222613 · 0222613
1 parent 603d00a
commit 0222613
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/tests/test_event_builder.py b/tests/test_event_builder.py
@@ -42,11 +42,6 @@ def test_init(self):
 
 
 class EventBuilderTest(base.BaseTest):
-<<<<<<< 938e96273b25996a1cc7df1fd7a7d5d44af76c8a
-=======
-
-  maxDiff = None
->>>>>>> rebase and resolve merge conflicts
 
   def setUp(self):
     base.BaseTest.setUp(self)