Removed comments about this issue from other tests

Author: cmazzullo

pandas/tests/indexes/test_multi.py

@@ -1573,10 +1573,7 @@ def test_is_(self):
         # shouldn't change
         assert mi2.is_(mi)
         mi4 = mi3.view()
-<<<<<<< HEAD
 
-=======
->>>>>>> 529a040... Added comments changes w/ bug number
         # GH 17464 - Remove duplicate MultiIndex levels
         mi4.set_levels([lrange(10), lrange(10)], inplace=True)
         assert not mi4.is_(mi3)
@@ -2380,8 +2377,11 @@ def test_level_setting_resets_attributes(self):
             ['A', 'A', 'B', 'B', 'B'], [1, 2, 1, 2, 3]
         ])
         assert ind.is_monotonic
+<<<<<<< HEAD
 
         # GH 17464 - Remove duplicate MultiIndex levels
+=======
+>>>>>>> 6ce2637... Removed comments about this issue from other tests
         ind.set_levels([['A', 'B'], [1, 3, 2]], inplace=True)
         # if this fails, probably didn't reset the cache correctly.
         assert not ind.is_monotonic