From cd9778f9bc2ffc77233d04bd34e4a5b5ef80b614 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E4=B8=AD=E9=87=8E=E6=B2=99=E7=B4=80?=
 <nakanosaki@nakanosaki-no-Mac-mini.local>
Date: Sat, 13 Feb 2016 14:07:27 +0900
Subject: [PATCH] "resolve conflict"

---
 src/Tools/Config/Define.inc | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 5142eb230e..eca8eb7b5f 100755
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -718,3 +718,21 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
-- 
2.11.0