From a1e6bb7fa9e122fb19006a56429574deb12448a2 Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 21 Jan 2021 16:08:28 +0800 Subject: [PATCH 1/2] fix conflict --- example/lib/main.dart | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index cad62b5..b488f98 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -21,7 +21,6 @@ class _MyAppState extends State { Future init() async { if (Platform.isIOS) { final res = await Mop.instance.initialize( -<<<<<<< HEAD '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c', apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop'); print(res); @@ -29,15 +28,6 @@ class _MyAppState extends State { final res = await Mop.instance.initialize( '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c', 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); } if (!mounted) return; From b49a6015f9a2e43de3cf060a096a1f8996cebba6 Mon Sep 17 00:00:00 2001 From: jizelin Date: Fri, 22 Jan 2021 09:37:39 +0800 Subject: [PATCH 2/2] Revert "fix conflict" This reverts commit a1e6bb7fa9e122fb19006a56429574deb12448a2. --- example/lib/main.dart | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/example/lib/main.dart b/example/lib/main.dart index b488f98..cad62b5 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -21,6 +21,7 @@ class _MyAppState extends State { Future init() async { if (Platform.isIOS) { final res = await Mop.instance.initialize( +<<<<<<< HEAD '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c', apiServer: 'https://api.finclip.com', apiPrefix: '/api/v1/mop'); print(res); @@ -28,6 +29,15 @@ class _MyAppState extends State { final res = await Mop.instance.initialize( '22LyZEib0gLTQdU3MUauAZ0pZVbKTWGmNN6Lx8hXhIkA', '74bde5fad53a817c', 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); } if (!mounted) return;