py-cvs merge, correct indentation
1 file changed