subversion: Fix merge conflict (#20490)
subversion: Fix merge conflict (#20490)

* subversion: Fix merge conflict

* subversion: Force serf into rpath
rwhogg/homebrew-core,Linuxbrew/homebrew-core,rwhogg/homebrew-core,maxim-belkin/homebrew-core,maxim-belkin/homebrew-core,Linuxbrew/homebrew-core