From 1f728c31a06d4b4fde83bbaa493c7a7b25b7b5a2 Mon Sep 17 00:00:00 2001
From: Hans Leiss <leiss@cis.uni-muenchen.de>
Date: Sat, 5 Aug 2023 19:11:21 +0200
Subject: [PATCH] Conflict marker in ExtendGer removed

---
 src/german/ExtendGer.gf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/german/ExtendGer.gf b/src/german/ExtendGer.gf
index 1e7d7f3c5..e33ec17fa 100644
--- a/src/german/ExtendGer.gf
+++ b/src/german/ExtendGer.gf
@@ -186,5 +186,4 @@ lin CompoundN a x =
           g = x.g
           } ;
 
->>>>>>> master
 }