1550445 fix ver-rel cvs conflict

Authored and Committed by petersen 18 years ago
    fix ver-rel cvs conflict
    
        
file modified
+0 -5