fix _stringify_path doc

CRiddler · web-flow · commit cf631067bb62 · 2019-10-16T13:45:53.000-07:00
diff --git a/nibabel/filename_parser.py b/nibabel/filename_parser.py
@@ -22,10 +22,7 @@ def _stringify_path(filepath_or_buffer):
     Parameters
     ----------
     filepath_or_buffer : str or os.PathLike
-<<<<<<< HEAD
-    
-=======
->>>>>>> fbaeacc96dfdd7d4331cc14bf5ce0c4ae3547bec
+
     Returns
     -------
     str_filepath_or_buffer : maybe a string version of the object
