144e99d Correct release after merge conflict

Authored and Committed by hno 12 years ago
1 file changed. 2 lines added. 2 lines removed.
    Correct release after merge conflict
    
        
file modified
+2 -2