jdorje: Add conflicts for some nations. Patch by Da...

[email protected] Wed, 28 Sep 2005 18:31:02 -0700

Newsgroups	gmane.games.freeciv.cvs
Message-ID	<[email protected]>

This is an automated notification of a change to freeciv cvs, 
on Wed Sep 28 18:27:22 PDT 2005 = Thu Sep 29 01:27:23 2005 (GMT)
by Jason Dorje Short <[email protected]>

---- Files affected:

freeciv/data/nation aztec.ruleset british.ruleset carthaginian.ruleset egyptian.ruleset filipino.ruleset german.ruleset hungarian.ruleset indonesian.ruleset irish.ruleset latvian.ruleset malaysian.ruleset newzealand.ruleset polish.ruleset serbian.ruleset spanish.ruleset uyghur.ruleset

---- Log message:
      Tag: HEAD

Add conflicts for some nations.

Patch by Daniel Markstedt <[email protected]> in PR#14132.