fix: merge error in a previous import
Merge pull request #131 from scality/scality_svn

fix: merge error in a previous import