From 76c6b6b0926fb56ad0865213d97d603f4b979668 Mon Sep 17 00:00:00 2001
From: Daigo Moriwaki <daigo@debian.org>
Date: Sat, 22 Feb 2014 22:03:14 +0900
Subject: [PATCH] Corrected a merge miss in changelog caused by the previous
 merge

---
 changelog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/changelog b/changelog
index f167a90..69e6b33 100644
--- a/changelog
+++ b/changelog
@@ -61,10 +61,8 @@
 	    factory function name generating a pairing method which will be
 	    used in a specific Floodgate game.
 	    ex. set pairing_factory floodgate_zyunisen 
-=======
 	  - Implemented conversion of move representation between CSA format
 	    and USI one.
->>>>>>> 201312-usiToCsa
 
 2013-11-24  Daigo Moriwaki <daigo at debian dot org>
 
-- 
2.11.0