resolve problem

Author: ebang091

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.