解决冲突

2023-09-26 15:38:06 +08:00 · 2023-09-26 15:38:06 +08:00 · c9c7f00cb4
parent 5606f294e5
commit c9c7f00cb4
1 changed files with 0 additions and 4 deletions
--- a/ios/Classes/Api/MOP_initialize.m
+++ b/ios/Classes/Api/MOP_initialize.m
@ -9,12 +9,8 @@
 #import <FinApplet/FinApplet.h>
 //#import <FinAppletExt/FinAppletExt.h>
 #import "FinAppletExt.h"
-<<<<<<< HEAD
 //#import <FinAppletClipBoard/FinAppletClipBoard.h>
-=======
-#import <FinAppletClipBoard/FinAppletClipBoard.h>
 #import <FinAppletBLE/FinAppletBLE.h>
->>>>>>> 52e29a405e7ec23920852d84766efd035191edc2
 #import "MOPTools.h"

@implementation MOP_initialize