* STATUS: remove conflict marker accidentally committed in r1483565

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1483571 13f79535-47bb-0310-9956-ffa450edef68