Conflict marker in ExtendGer removed
This commit is contained in:
1 parent
b76b8af7b2
commit
1f728c31a0
1 file changed
-1
@@ -186,5 +186,4 @@ lin CompoundN a x =
|
||||
g = x.g
|
||||
} ;
|
||||
|
||||
>>>>>>> master
|
||||
}
|
||||
Reference in new issue
Block a user