refs/heads/1.10.x-issue4762 - subversion

commit: 1775bcdccb937fb32f14f2070ebe88512533f39a
[log]
author: Stefan Sperling <stsp@apache.org>
Fri Jan 22 12:35:57 2021 +0000
committer: Stefan Sperling <stsp@apache.org>
Fri Jan 22 12:35:57 2021 +0000
tree: 48747520a8951483e4ff88bae48a56eb4cfa2afd
parent: 59a7ef25e1c224961923a0211e8f09fe12d36a8a [diff]

1.10.x fix for issue #4762 "authz doesn't combine global and repository rules"

These changes do not merge cleanly to 1.10.x because of a whitespace change.

* subversion/libsvn_repos/authz.c
  (create_user_authz): Resolve a trivial text conflict due to trailing
   whitespace which was removed on trunk in r1875617.


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

subversion/libsvn_repos/authz.c[diff]
subversion/tests/libsvn_repos/authz-test.c[diff]

2 files changed

tree: 48747520a8951483e4ff88bae48a56eb4cfa2afd