93e93bf Fixed merge conflicts

Merged and Committed by bsjones 12 years ago
    Fixed merge conflicts
    
        
file modified
+3 -0