d3fcdbe Fix merge conflicts

Authored and Committed by Fabio Alessandro Locati 8 years ago
    Fix merge conflicts
    
        
file modified
+0 -3
file modified
+0 -4