forked from GitHub/gf-rgl
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