This is an automated email from the ASF dual-hosted git repository. maskit pushed a change to branch quic-latest in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 3d038e4 Remove conflict marker
add d8a5b91 Fix compile error because of incomplete merge
No new revisions were added by this update.
Summary of changes:
src/traffic_quic/traffic_quic.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
