[Freeciv-Dev] (PR#14132) Data: Nation overhaul step 2, conflicts

["Guest" <rt-guest@xxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14132 >


>--- data/nation/newzealand.ruleset     28 Sep 2005 03:33:18 -0000 1.7
>+++ data/nation/newzealand.ruleset     28 Sep 2005 18:52:50 -0000
>@@ -4,6 +4,7 @@
> name=_("New Zealand")
> plural=_("?plural:New Zealanders")
> groups=_("Modern"), _("Australian")
>+conflicts_with="newzealand"   ; Similar flags

Presumably this is meant to be conflicts_with="australian" ?

dms


diff -urd -Xdiff_ignore freeciv/data/nation/newzealand.ruleset 
freeciv-new/data/nation/newzealand.ruleset
--- freeciv/data/nation/newzealand.ruleset      2005-09-30 20:50:12.000000000 
+1200
+++ freeciv-new/data/nation/newzealand.ruleset  2005-09-30 21:20:29.000000000 
+1200
@@ -4,7 +4,7 @@
 name=_("New Zealand")
 plural=_("?plural:New Zealanders")
 groups=_("Modern"), _("Australian")
-conflicts_with="newzealand"    ; Similar flags
+conflicts_with="australian"    ; Similar flags
 legend=_("The island group of New Zealand was annexed by Britain in 1840.\
  Following a royal proclamation in 1907, the country became an independent\
  dominion within the Commonwealth of Nations.")