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

`make resolve_conflict' does not checkout `doc/ISISscripts.pdf' any more

parent 0b7e15d8
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