diff options
| author | Stefan Kögl <stefan@skoegl.net> | 2017-09-10 19:23:50 +0200 |
|---|---|---|
| committer | Stefan Kögl <stefan@skoegl.net> | 2017-09-10 19:23:50 +0200 |
| commit | e64987174866ef371f4df048d212eeba4f1a0013 (patch) | |
| tree | 79b6bbbd64716fbc0f86ea24d8d82e1a372ed788 /jsonpatch.py | |
| parent | 7583258b618a4b651bb2fa41c12ff1c27de15d18 (diff) | |
| download | python-json-patch-e64987174866ef371f4df048d212eeba4f1a0013.tar.gz | |
Remove trailing whitespace
Diffstat (limited to 'jsonpatch.py')
| -rw-r--r-- | jsonpatch.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jsonpatch.py b/jsonpatch.py index b1c56d0..cee4820 100644 --- a/jsonpatch.py +++ b/jsonpatch.py @@ -176,10 +176,10 @@ def make_patch(src, dst): # fix when patch with optimization is incorrect patch = JsonPatch.from_diff(src, dst) try: - new = patch.apply(src) + new = patch.apply(src) except JsonPatchConflict: # see TODO return JsonPatch.from_diff(src, dst, False) - + if new != dst: return JsonPatch.from_diff(src, dst, False) |