mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 17:08:54 -06:00
Conflict marker in ExtendGer removed
This commit is contained in:
@@ -186,5 +186,4 @@ lin CompoundN a x =
|
|||||||
g = x.g
|
g = x.g
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
>>>>>>> master
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user