8232254 fix merge conflict, update README

Authored and Committed by agerstmayr 3 years ago
    fix merge conflict, update README
    
        
file modified
+1 -1
file modified
+0 -5