From: Neil Smith <neil.git@njae.me.uk>
Date: Sat, 9 Nov 2019 19:55:20 +0000 (+0000)
Subject: Fixed merging bug
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;ds=sidebyside;h=53f5be76d47f795f02deab536f055a32de1abe46;hp=53f5be76d47f795f02deab536f055a32de1abe46;p=cipher-tools.git

Fixed merging bug
---