162554c remove unnecessary conflict in libmodman

Authored and Committed by npmccallum 13 years ago
    remove unnecessary conflict in libmodman
    
        
file modified
+5 -5