fix conflict

Author: juleek

pandas/tests/groupby/test_grouping.py

@@ -441,6 +441,7 @@ def test_groupby_grouper_f_sanity_checked(self):
  msg = "'Timestamp' object is not subscriptable"
  with pytest.raises(TypeError, match=msg):
  ts.groupby(lambda key: key[0:6])
+
  result = ts.groupby(lambda x: x).sum()
  expected = ts.groupby(ts.index).sum()
  expected.index.freq = None