Spell conflict correctly

Author: tshauck

pandas/tests/test_panel.py

@@ -1302,7 +1302,7 @@ def test_update_raise(self):
                     [1.5, np.nan, 3.]]])
 
         np.testing.assert_raises(Exception, pan.update, *(pan,),
-            **{'raises_conflick': True})
+            **{'raise_conflict': True})
 
 class TestLongPanel(unittest.TestCase):
     """