2c20484 fix dos encoding on logresolvemerge.pl (bug 212965)

Authored and Committed by abompard 17 years ago
1 file changed. 5 lines added. 2 lines removed.
    fix dos encoding on logresolvemerge.pl (bug 212965)
    
        
file modified
+5 -2