331b4d5 Fixed changelog merge conflict

Authored and Committed by Roman Inflianskas a year ago
    Fixed changelog merge conflict
    
        
file modified
+0 -1