Skip to content

Commit 061e0aa

Browse files
committed
update _stringify_path doc
2 parents d6c96c0 + fbaeacc commit 061e0aa

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

nibabel/filename_parser.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ def _stringify_path(filepath_or_buffer):
2222
Parameters
2323
----------
2424
filepath_or_buffer : str or os.PathLike
25+
<<<<<<< HEAD
2526
27+
=======
28+
>>>>>>> fbaeacc96dfdd7d4331cc14bf5ce0c4ae3547bec
2629
Returns
2730
-------
2831
str_filepath_or_buffer : maybe a string version of the object

0 commit comments

Comments
 (0)