2281395 Remove merge conflict in changelog

Authored and Committed by berrange 10 years ago
    Remove merge conflict in changelog
    
        
file modified
+0 -5