Skip to content
Snippets Groups Projects
Commit 844573c1 authored by Riccardo Longo's avatar Riccardo Longo Committed by Frank Winklmeier
Browse files

Revert "Remove remnants in the code from conflicts - committed by mistake" 

Done by mistake on master in my fork

This reverts commit e886fe5f.
parent 8f05efa3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 455 additions and 194 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