fix conflict

2021-03-24 17:27:20 +08:00 · 2021-03-24 17:27:20 +08:00 · 0d74923a50
parent f142b38214 356091eef8
commit 0d74923a50
3 changed files with 7 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,7 @@
+## 2.22.4
+Release
+## 2.22.2
+Release
 ## 2.22.1
 Release
 ## 2.21.1
--- a/android/build.gradle
+++ b/android/build.gradle
@ -91,6 +91,6 @@ kapt {
 }
 dependencies {
    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.finogeeks.lib:finapplet:2.21.2-fix20210302V01'
-    implementation 'com.finogeeks.mop:plugins:2.21.1'
+    implementation 'com.finogeeks.lib:finapplet:2.23.1'
+    implementation 'com.finogeeks.mop:plugins:2.23.1'
 }
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,6 +1,6 @@
 name: mop
 description: A Finogeeks MiniProgram Flutter SDK.
-version: '2.22.1'
+version: '2.23.3'
 homepage: https://github.com/finogeeks/mop-flutter-sdk

 environment: