diff ikariam.sql @ 53:336164c9a983

fixed the conflict
author "Rex Tsai <chihchun@kalug.linux.org.tw>"
date Mon, 20 Oct 2008 20:54:15 +0800
parents 0644b53fd3af
children 34749e907405
line wrap: on
line diff