mirror of
https://github.com/samba-team/samba.git
synced 2025-01-21 18:04:06 +03:00
7071888d5b
Previously if there was a conflict, but the incoming object would still win, this was not marked as a rename, and so inheritence was not done. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12497 Signed-off-by: Andrew Bartlett <abartlet@samba.org>