3584b00 fixed conflicts in the previous release

Authored and Committed by gnaponie 6 years ago
    fixed conflicts in the previous release
    
        
file modified
+0 -16
file modified
+0 -4