e7eb5a conflicting the version when the change happened doesnt make sense

Authored and Committed by Zdenek Dohnal 3 years ago
1 file changed. 6 lines added. 3 lines removed.
    conflicting the version when the change happened doesnt make sense
    
        
file modified
+6 -3