From 3261b87cf54fbccc9b2a306e032be9941db509cb Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Tue, 20 Aug 2019 23:06:25 +0900
Subject: [PATCH] Remove merge marker from CHANGES

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

diff --git a/CHANGES b/CHANGES
index 46323693ac5..c65607c24fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Release 3.0.0 (in development)
 ==============================