d707aa3 Fix changelog from merge conflicts

Authored and Committed by Ricky Elrod 10 years ago
1 file changed. 4 lines added. 4 lines removed.
    Fix changelog from merge conflicts
    
        
file modified
+4 -4