Skip to content
Snippets Groups Projects
Commit 7fe45501 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

FIX: corrected unresolved merge in makefile

parent c5a196f0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment