Branch: refs/heads/master Home: https://github.com/resteasy/Resteasy Commit: fa31a53417c4e4da3cc1f0434a4cbcc15229d673 https://github.com/resteasy/Resteasy/commit/fa31a53417c4e4da3cc1f0434a4cb... Author: Alessio Soldano <asoldano(a)redhat.com&gt; Date: 2019-05-03 (Fri, 03 May 2019) Changed paths: M resteasy-core/src/main/java/org/jboss/resteasy/core/ServerResponseWriter.java Log Message: ----------- [RESTEASY-2232] Fix merge conflict