Correct merge issue

Author: cchighman

python/pyspark/sql/readwriter.py

@@ -457,7 +457,8 @@ def parquet(self, *paths, **options):
         return self._df(self._jreader.parquet(_to_seq(self._spark._sc, paths)))
 
     def text(self, paths, wholetext=False, lineSep=None, pathGlobFilter=None,
-             recursiveFileLookup=None):
+             recursiveFileLookup=None, modifiedBefore=modifiedBefore,
+             modifiedAfter=modifiedAfter):
         """
         Loads text files and returns a :class:`DataFrame` whose schema starts with a
         string column named "value", and followed by partitioned columns if there