This is an automated email from the ASF dual-hosted git repository. jfthomps pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/vcl.git
commit 5250d8ea1f6b4295e4364ccd849a77bd7835818c Merge: eb16528 e1d7e13 Author: Josh Thompson <[email protected]> AuthorDate: Thu Jun 11 17:03:09 2020 -0400 Resolved merge conflict by taking most recent version managementnode/bin/cygwin-sshd-config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
