3798173 Resolve file conflict, shellfuncs is provided by resource-agents

Authored and Committed by beekhof 14 years ago
    Resolve file conflict, shellfuncs is provided by resource-agents
    
        
file modified
+6 -3