Skip to content
Commit c594a70f authored by Manfred Hanke's avatar Manfred Hanke 💻
Browse files

Makefile updated 

make resolve_conflict
   does a checkout of the auto-generated files
   which eventually create a conflict
parent cef82dcf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment