OSDN Git Service

"resolve conflict"
author中野沙紀 <nakanosaki@nakanosaki-no-Mac-mini.local>
Sat, 13 Feb 2016 05:07:27 +0000 (14:07 +0900)
committer中野沙紀 <nakanosaki@nakanosaki-no-Mac-mini.local>
Sat, 13 Feb 2016 05:07:27 +0000 (14:07 +0900)
src/Tools/Config/Define.inc

index 5142eb2..eca8eb7 100755 (executable)
@@ -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