* STATUS: Remove the conflict notice since I did a syncup on the branch.


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