fix merge conflicts

apache · May 3, 2015 · bced829 · bced829
1 parent a63ad00
commit bced829
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py
@@ -1381,17 +1381,15 @@ def cov(self, col1, col2):
 
     cov.__doc__ = DataFrame.cov.__doc__
 
-<<<<<<< HEAD
     def crosstab(self, col1, col2):
         return self.df.crosstab(col1, col2)
 
     crosstab.__doc__ = DataFrame.crosstab.__doc__
-=======
+
     def freqItems(self, cols, support=None):
         return self.df.freqItems(cols, support)
 
     freqItems.__doc__ = DataFrame.freqItems.__doc__
->>>>>>> 49549d5a1a867c3ba25f5e4aec351d4102444bc0
 
 
 def _test():