From 27aae32ff6cfbacbaf98764ac5481982f5f3f578 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 22 Apr 2019 11:34:45 +0100
Subject: [PATCH] oops

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e6748150..d49b534f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 21/9/18 started 8.8.0
 - much faster smartcrop [lovell]
 - add low/high to smartcrop [jcupitt]