wu-sheng commented on a change in pull request #7: A new data type for complex
data type.
URL:
https://github.com/apache/incubator-skywalking-oal-tool/pull/7#discussion_r217898911
##########
File path:
oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
##########
@@ -54,6 +56,7 @@ public class ServiceInstanceJVMGCDispatcher implements
SourceDispatcher<ServiceI
}
</#list>
</#if>
+>>>>>>> ec8e105709a1377c62448cafe9049e79959827f1
Review comment:
Solve the conflicts, please. And your pr in main repo, should include all
new generated codes, which shouldn't pass ci based on this.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
