grim/convey

Fix merge conflict in changelog (omg).
expand-list
2017-10-03, Eric Fritz
857d4e84d561
Parents ac2ec4fef0a1
Children a495ad4dc08f
Fix merge conflict in changelog (omg).
1 files changed, 1 insertions(+), 0 deletions(-)
  • +1 -0
    ChangeLog
    • --- a/ChangeLog Tue Oct 03 21:41:11 2017 -0500
    +++ b/ChangeLog Tue Oct 03 21:45:08 2017 -0500
    @@ -1,4 +1,5 @@
    0.10.2:
    + * Added support for merging plans when extending. PR #27 (Eric Fritz)
    * Fix Push/Pop Extend Frame breakage under concurrent execution. Fixed #126 (Eric Fritz)
    * Fritz fixed a goof. Fixed #125. (Eric Fritz)