| commit | f2564270382c7fc9862041ad8cd5f9a7ceb55bdf | [log] [tgz] |
|---|---|---|
| author | lundblad <lundblad@unknown> | Thu Dec 01 14:17:15 2005 +0000 |
| committer | lundblad <lundblad@unknown> | Thu Dec 01 14:17:15 2005 +0000 |
| tree | 3a36d2f28eece1587d19854c5611b53b80801908 | |
| parent | ed23b9e6d39aa377bf6fbe44d250df103ca7f0b1 [diff] |
On wc-propcaching branch: Follow-up to r17223. * contrib/client-side/svnmerge_test.py: Remove conflict stuff that accidentally wasn't removed while merging from trunk. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/wc-propcaching@857656 13f79535-47bb-0310-9956-ffa450edef68