5a5fb028fee3 — Chris Cannam tip 8 days ago
Oops! Remove diff markers
1 files changed, 0 insertions(+), 4 deletions(-)

M README.md
M README.md +0 -4
@@ 42,9 42,5 @@ C++ standard required: C++98 (does not u
 
 [![Build Status](https://travis-ci.org/breakfastquay/bqfft.svg?branch=master)](https://travis-ci.org/breakfastquay/bqfft)
 
-<<<<<<< working copy
 Copyright 2007-2020 Particular Programs Ltd. See the file COPYING for
-=======
-Copyright 2007-2019 Particular Programs Ltd. See the file COPYING for
->>>>>>> merge rev
 (BSD/MIT-style) licence terms.