954401e68e
Merge commit '308a28d6cd2e87028e535eabccb89a9dc2fd9515'
7 lines
321 B
Plaintext
7 lines
321 B
Plaintext
make: "parse.mk" line 7: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
|
|
make: "parse.mk" line 14: Makefile appears to contain unresolved CVS/RCS/??? merge conflicts
|
|
make: "parse.mk" line 24: Invalid line type
|
|
make: Fatal errors encountered -- cannot continue
|
|
make: stopped in unit-tests
|
|
exit status 1
|