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
+4 -4
View File
@@ -3,10 +3,10 @@
concrete SymbolGer of Symbol = CatGer ** open Prelude, ResGer in {
lin
SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c
IntPN i = {s = \\c => i.s ; g = Neutr} ; --- c
FloatPN i = {s = \\c => i.s ; g = Neutr} ; --- c
NumPN i = {s = i.s ! Neutr ; g = Neutr} ; --- c
SymbPN i = {s = \\c => i.s ; g = Neutr ; n = Sg} ; --- c
IntPN i = {s = \\c => i.s ; g = Neutr ; n = Sg} ; --- c
FloatPN i = {s = \\c => i.s ; g = Neutr ; n = Sg} ; --- c
NumPN i = {s = i.s ! Neutr ; g = Neutr ; n = Sg} ; --- c
CNIntNP cn i = {
s = \\b,c => cn.s ! Weak ! Sg ! Nom ++ i.s ;