https://bugs.kde.org/show_bug.cgi?id=469853
--- Comment #2 from kde_b...@lukas1818.de --- Can confirm that is fixed now. Have hit a merge conflict today and everything works fine again. Thanks for the fix -- You are receiving this mail because: You are watching all bug changes.
