phiz-bak
/
mop-flutter-sdk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

phiz_2.41.13.1
Stewen 2023-09-26 15:38:06 +08:00
parent 5606f294e5
commit c9c7f00cb4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ios/Classes/Api/MOP_initialize.m
View File

@ -9,12 +9,8 @@
#import <FinApplet/FinApplet.h> #import <FinApplet/FinApplet.h>
//#import <FinAppletExt/FinAppletExt.h> //#import <FinAppletExt/FinAppletExt.h>
#import "FinAppletExt.h" #import "FinAppletExt.h"
<<<<<<< HEAD
//#import <FinAppletClipBoard/FinAppletClipBoard.h> //#import <FinAppletClipBoard/FinAppletClipBoard.h>
=======
#import <FinAppletClipBoard/FinAppletClipBoard.h>
#import <FinAppletBLE/FinAppletBLE.h> #import <FinAppletBLE/FinAppletBLE.h>
>>>>>>> 52e29a405e7ec23920852d84766efd035191edc2
#import "MOPTools.h" #import "MOPTools.h"
@implementation MOP_initialize @implementation MOP_initialize