From: Matthew Vernon <matthew@debian.org>
Date: Sat, 21 Nov 2015 12:03:44 +0000 (+0000)
Subject: tidy up conflict
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=pcre3.git;a=commitdiff_plain;h=d9aaaf6dc5a7494b04e600f1e7d3da561aff0daf;hp=36d56c1e13c6d0159d44a9c1c93a610d0981bc06

tidy up conflict
---