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

fix conflict

master
developer 2021-01-21 16:08:28 +08:00
parent 2c5a418897
commit a1e6bb7fa9
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
example/lib/main.dart
View File

@ -21,7 +21,6 @@ class _MyAppState extends State<MyApp> {
Future<void> init() async { Future<void> init() async {
if (Platform.isIOS) { if (Platform.isIOS) {
final res = await Mop.instance.initialize( final res = await Mop.instance.initialize(
<<<<<<< HEAD
'22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c', '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c',
apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop'); apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop');
print(res); print(res);
@ -29,15 +28,6 @@ class _MyAppState extends State<MyApp> {
final res = await Mop.instance.initialize( final res = await Mop.instance.initialize(
'22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c', '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c',
apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop'); apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop');
=======
'22LyZEib0gLTQdU3MUauATaGrbb4xsJ87TEDJExdNRsA', 'c7a85a043973223b',
apiServer: 'https://mp.finogeeks.com', apiPrefix: '/api/v1/mop');
print(res);
} else if (Platform.isAndroid) {
final res = await Mop.instance.initialize(
'22LyZEib0gLTQdU3MUauATaGrbb4xsJ87TEDJExdNRsA', 'c7a85a043973223b',
apiServer: 'https://mp.finogeeks.com', apiPrefix: '/api/v1/mop');
>>>>>>> 273af8333b2af783766fd287d56301f4c8a9933b
print(res); print(res);
} }
if (!mounted) return; if (!mounted) return;