3699d69 Fixed conflict with mariadb-galera-server

Authored and Committed by Jakub Dorňák 6 years ago
1 file changed. 6 lines added. 3 lines removed.
    Fixed conflict with mariadb-galera-server
    
        
file modified
+6 -3