# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225557038 -28800
# Node ID 278bd36708e89198e975d7706c324cf9c40a7598
# Parent  eff35293a058c954fc0c33ea5c384cab9d15d0ef# Parent  1507c2d16b35a9b15ee189f4f94b49f476a11c87
merged.

diff -r 1507c2d16b35 -r 278bd36708e8 overall.yaml
--- a/overall.yaml	Sat Nov 01 22:21:25 2008 +0800
+++ b/overall.yaml	Sun Nov 02 00:30:38 2008 +0800
@@ -22,15 +22,12 @@
      # 發明 (兵工廠)
      - is_invention_researched:
         0: research_knowledge
-     # 異國文化
+     # 異國文化, 建造博物館
      - is_culturalexchange_researched:
-        0: research_seafaring
+        0: research_knowledge
      # 希臘火, 建造噴火船
      - is_greekfire_researched:
         0: research_seafaring
-     # 文化交流, 建造博物館
-     - is_culturalexchange_researched:
-        0: research_knowledge
         
    1: run_defence
    # we are being attacked!!!!!!!!!!!!!