From d7163f09cab7e904760caf625155642c844aaffd Mon Sep 17 00:00:00 2001
From: Yoshiki Shibukawa <yoshiki@shibu.jp>
Date: Sun, 26 Feb 2017 21:33:42 +0900
Subject: [PATCH] Update CHANGES

Remove accidental line
---
 CHANGES | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e37861e99..01f810cd4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Release 1.6 (in development)
 ============================