Skip to content
GitLab
Commits (2)
Hide whitespace changes
Inline Side-by-side
ttcn/LibHttp/ttcn/LibHttp_XmlMessageBodyTypes.ttcn
View file @ ffbcefb5
......@@ -19,11 +19,6 @@ module LibHttp_XmlMessageBodyTypes {
}
} with {
<<<<<<< Updated upstream
variant "";
encode "XML"
=======
encode "XML";
variant ""
>>>>>>> Stashed changes
} // End of LibHttp_XmlMessageBodyTypes