e52f79c Fix conflicts

Authored and Committed by williamjmorenor 8 years ago
    Fix conflicts
    
        
file removed
-0
file modified
+2 -19