fix conflict

Signed-off-by: Neil Shen <overvenus@gmail.com>
pingcap · Apr 6, 2023 · 7ec8cb8 · 7ec8cb8
1 parent 03be1ff
commit 7ec8cb8
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/errors.toml b/errors.toml
@@ -706,19 +706,11 @@ error = '''
 MySQL worker panic
 '''
 
-<<<<<<< HEAD
-["CDC:ErrNewCaptureFailed"]
-error = '''
-new capture failed
-'''
-
 ["CDC:ErrNewProcessorFailed"]
 error = '''
 new processor failed
 '''
 
-=======
->>>>>>> 94497b4d54 (cdc: retry internal context deadline exceeded  (#8602))
 ["CDC:ErrNewSemVersion"]
 error = '''
 create sem version