Skip to content
Commit 89b312fe authored by Pierre Krieger's avatar Pierre Krieger Committed by Bastian Köcher
Browse files

Revert #2745 (#2791) 

* Revert #2745

* Fix error in merge resolve

* Fix compilation
parent a5964e40
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