Skip to content
Commit eb3f48b9 authored by Thomas Gubler's avatar Thomas Gubler
Browse files

fix merge errors and unused-variable error

parent 705ab124
Hide whitespace changes
Inline Side-by-side
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