commit be6125abcdcb49fafd982bf81da2d92a349c4a01
Merge: afea6ef a7e5964
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Sun Aug 18 14:07:04 2019 -0400

    Merge pull request #3 from hajapy/patch-1
    
    Reconcile clobber error with jsonpatch

commit a7e596433804016ae1a424d63edf88795138efb0
Author: Andrew Achkar <hajapy@users.noreply.github.com>
Date:   Sun Aug 18 05:43:02 2019 -0400

    Reconcile clobber error with jsonpatch
    
    Fixes https://github.com/conda-forge/jsonpatch-feedstock/issues/11
    Context: https://github.com/xlwings/jsondiff/issues/24 https://github.com/stefankoegl/python-json-patch/issues/93

commit afea6ef73fc4b66dd692d350d2c0174e60ab3302
Merge: a23fbbb c3c2c6f
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Sun Aug 4 17:37:30 2019 -0400

    Merge pull request #2 from regro-cf-autotick-bot/1.2.0
    
    jsondiff v1.2.0

commit c3c2c6f1415146858edec8ae1a8597d7002c9c6f
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Jun 23 15:29:11 2019 +0000

    MNT: Re-rendered with conda-build 3.18.4, conda-smithy 3.3.7, and conda-forge-pinning 2019.06.19

commit f3c50cbad20945d0683dfa7630c53d740b1785b3
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Jun 23 15:28:59 2019 +0000

    updated v1.2.0

commit a23fbbb80ddb4a37826c967df59ede54d2b36e61
Merge: 25e03f9 4c24e24
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Sat Feb 2 16:12:02 2019 -0500

    Merge pull request #1 from regro-cf-autotick-bot/1.1.2
    
    jsondiff v1.1.2

commit 4c24e245f8af5a4ff773340618bc3886a545261b
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Feb 2 19:03:26 2019 +0000

    MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.12, and conda-forge-pinning 2019.01.29

commit fc3bfc05ca784cdd8b83dcbf0171662dc22ed636
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Aug 29 20:09:46 2018 +0000

    updated v1.1.2

commit 25e03f93ff184e02b64f40b0d192065e5bc0fdfb
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Wed Aug 29 19:57:22 2018 +0000

    Re-render the feedstock after CI registration.

commit fedeec2ba1a25daca8908988f2524ddd24945b0b
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Wed Aug 29 19:56:15 2018 +0000

    Initial feedstock commit with conda-smithy 3.1.12.
