296f8e9 Bump version to resolve conflict

Authored and Committed by alexpl 5 years ago
    Bump version to resolve conflict
    
        
file modified
+5 -2