7522011 conflict instead of requires

Authored and Committed by Jeremy Katz 16 years ago
    conflict instead of requires
    
        
file modified
+3 -2