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
+2 -2
View File
@@ -106,8 +106,8 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer, Coordination in {
UseComp comp =
insertExtrapos comp.ext (insertObj comp.s (predV sein_V)) ; -- agr not used
-- adj slot not used here for e.g. "ich bin alt" but same behaviour as NPs?
-- "ich bin nicht alt" "ich bin nicht Doris"
-- SS: adj slot not used here for e.g. "ich bin alt" but same behaviour as NPs?
-- "ich bin nicht alt" "ich bin nicht Doris"
UseCopula = predV sein_V ;