6eef531 Drop Conflicts with rgmanager

Authored and Committed by fabbione 15 years ago
    Drop Conflicts with rgmanager
    
        
file modified
+4 -8