Skip to content

Commit 312a42c

Browse files
authored
Merge pull request #176 from dpath-maintainers/bugfix/175-trailling-comma-in-deprecated-merge
Bugfix/175 trailling comma in deprecated merge
2 parents 45b3488 + f3303eb commit 312a42c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

dpath/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ def search(obj, glob, yielded=False, separator="/", afilter=None, dirs=True):
4848

4949
@deprecated
5050
def merge(dst, src, separator="/", afilter=None, flags=MergeType.ADDITIVE):
51-
return dpath.merge(dst, src, separator, afilter, flags),
51+
return dpath.merge(dst, src, separator, afilter, flags)

dpath/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = "2.1.2"
1+
VERSION = "2.1.3"

0 commit comments

Comments
 (0)