Conflict marker in ExtendGer removed

2026-05-27 17:08:54 -06:00 · 2023-08-05 19:11:21 +02:00
parent b76b8af7b2
commit 1f728c31a0
1 changed files with 0 additions and 1 deletions
--- a/src/german/ExtendGer.gf
+++ b/src/german/ExtendGer.gf
@@ -186,5 +186,4 @@ lin CompoundN a x =
          g = x.g
          } ;

->>>>>>> master
 }