Remove merge marker from CHANGES

This commit is contained in:
Takeshi KOMIYA 2019-08-20 23:06:25 +09:00
parent 01f8dad160
commit 3261b87cf5

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
Release 3.0.0 (in development)
==============================