Added test to make sure a ValueError is thrown

Author: cmazzullo

pandas/tests/indexes/test_multi.py

@@ -2456,11 +2456,6 @@ 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