odbozhou commented on code in PR #316:
URL: https://github.com/apache/rocketmq-connect/pull/316#discussion_r980163324
##########
rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/service/StateManagementService.java:
##########
@@ -30,6 +30,10 @@ public interface StateManagementService {
/**
* init state management service
+<<<<<<< HEAD
+ *
Review Comment:
Code conflict ？
##########
rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/serialization/Serde.java:
##########
@@ -22,13 +22,21 @@
/**
* serializer and deserializer wrapper
+<<<<<<< HEAD
+ *
+=======
+>>>>>>> master
* @param <T>
*/
public interface Serde<T> extends Closeable {
/**
* configs in key/value pairs
+<<<<<<< HEAD
Review Comment:
Code conflict ？
##########
rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/serialization/Serde.java:
##########
@@ -22,13 +22,21 @@
/**
* serializer and deserializer wrapper
+<<<<<<< HEAD
+ *
Review Comment:
Code conflict ？
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
