https://bugs.winehq.org/show_bug.cgi?id=46833 Fabian Maurer <dark.shadow4(a)web.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Regression SHA1| |e4ca5dbec056c977bffce31bd79 | |01aaec884f199 CC| |huw(a)codeweavers.com Component|-unknown |wineserver --- Comment #15 from Fabian Maurer <dark.shadow4(a)web.de> --- Yeah, forgot to say that I forced git to use the "Remote" version during the merge conflict... But thanks for testing, CC'ing the author. -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.