resolve more conflicts

Author: myk002

gui/civ-alert.lua

@@ -218,7 +218,7 @@ function Civalert:init()
                 },
                 widgets.HotkeyLabel{
                     frame={t=3, l=0},
-                    key='CUSTOM_CTRL_W',
+                    key='CUSTOM_CTRL_N',
                     label='Sound alarm! Citizens run to safety!',
                     on_activate=sound_alarm,
                     enabled=can_sound_alarm,

internal/gm-unit/editor_civilization.lua

@@ -107,7 +107,7 @@ function CivBox:choose_race()
 end
 function CivBox:init(info)
     self.subviews.list.frame={t=3,r=0,l=0}
-    self.subviews.list.edit.ignore_keys={"STRING_A047"},
+    self.subviews.list.edit.ignore_keys={"STRING_A047"}
     self:addviews{
         widgets.Label{frame={t=1,l=0},text={
         {text="Filter race ",key="STRING_A047",key_sep="()",on_activate=self:callback("choose_race")},