From 92aa1230e23b3177525f2d6e9822351327269f09 Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 26 Apr 2014 18:24:37 +0000 Subject: [PATCH] resolved a conflict in DictionaryFin --- lib/src/translator/DictionaryFin.gf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 0eba0a991..9ffb946ed 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -48243,12 +48243,8 @@ lin staff_N = mkN "henkilökunta" ; lin staff_V2 = mkWV2 (k53A "miehittää") ; --UNCHK lin staff_office_N = mkWN (compoundN "henkilöstö" (k2 "osasto")) ; --UNCHK lin stag_N = mkWN (compoundN "uros" (k7 "hirvi")) ; --UNCHK -lin stag_V = variants{} ; -- -v v v v v v v -lin stage_N = mkN "näyttämö" ; --- split mkWN (k5A "etappi") ; --f57 -************* -lin stage_N = mkN "vaihe" | mkWN (k5A "etappi") ; --- split näyttämö -^ ^ ^ ^ ^ ^ ^ +lin stag_V = variants{} ; +lin stage_N = mkN "vaihe" | mkN "näyttämö" ; --- split lin stage_V = mkWV (k71 "tehdä") ; --UNCHK lin stage_V2 = mkWV2 (k71 "tehdä") ; --UNCHK lin stage_whisper_N = mkWN (compoundN "teatteri" (k39 "kuiskaus")) ; --UNCHK