Author: dmarks Date: Tue Feb 14 10:24:14 2006 New Revision: 11587 URL: http://svn.gna.org/viewcvs/freeciv?rev=11587&view=rev Log: Remove 'flag' conflicts that are no longer needed since flags have changed.
Modified:
branches/S2_1/data/nation/egyptian.ruleset
branches/S2_1/data/nation/iraqi.ruleset
