fix conflicts

This commit is contained in:
Krasimir Angelov
2025-10-25 08:21:28 +02:00
parent 1aed4c3b5f
commit 8e63f9b32d

View File

@@ -1,3 +1,16 @@
--# -path=.:../basque:../common:../abstract:../prelude
resource TryEus = SyntaxEus, LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj] ;
resource TryEus = SyntaxEus-[mkVoc], LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj,mkVoc] **
open (P = ParadigmsEus) in {
oper
mkAdv = overload SyntaxEus {
mkAdv : Str -> Adv = P.mkAdv ;
} ;
mkVoc = overload {
mkVoc : NP -> Voc = SyntaxEus.mkVoc ;
mkVoc : Str -> Voc = P.mkVoc ;
} ;
}