57716bc update conflicts/requires

Authored and Committed by Kyle McMartin 10 years ago
1 file changed. 7 lines added. 26 lines removed.
    update conflicts/requires
    
    and drop initscripts, patch from Kay.
    
        
file modified
+7 -26