resolve problem

ebang091 · ebang091 · commit 34977e0a9e76 · 2023-09-11T18:04:03.000+09:00
diff --git a/pymysqlreplication/event.py b/pymysqlreplication/event.py
@@ -379,7 +379,6 @@ class StopEvent(BinLogEvent):
 
 
 class XidEvent(BinLogEvent):
-<<<<<<< HEAD
     """
     A COMMIT event generated when COMMIT of a transaction that modifies 
     one or more tables of an XA-capable storage engine occurs.
