Monorepo for Tangled

knotserver/git/merge: pre-compile conflict error regex at package init master

Signed-off-by: Matías Insaurralde <matias@insaurral.de>


+3 -2
1 changed file