Synchronized remote master; then pulled and resolved conflicts

This commit is contained in:
Hans Leiss
2023-08-05 15:46:12 +02:00
440 changed files with 148090 additions and 97116 deletions
+3 -1
View File
@@ -109,7 +109,9 @@ concrete CatGer of Cat =
N = ResGer.Noun ;
N2 = ResGer.Noun ** {c2 : Preposition} ;
N3 = ResGer.Noun ** {c2,c3 : Preposition} ;
PN = {s : Case => Str; g : Gender} ;
GN = {s : Case => Str; g : Sex} ;
SN = {s : Sex => Case => Str} ;
LN, PN = {s : Case => Str; g : Gender; n : Number} ;
-- tense with possibility to choose conjunctive forms