conflict solved.

talut · Jul 17, 2020 · 9e7facd · 9e7facd
2 parents 009cecd + 1ec951c
commit 9e7facd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 Secure Storage for React Native (Android & iOS) - Keychain & Keystore
 
+## v3.0.0-beta.0
+This version still under development. But you can look and try. [v3.0.0-development Branch](https://github.com/talut/rn-secure-storage/tree/v3.0.0-development)
 
 ### After v2 this package has AndroidX support. If you want to use without AndroidX please use *v1.1.1*
 
@@ -134,9 +136,13 @@ npm install
 
 react-native run-ios/android
 ```
+### Version 2.0.6
+- [https://github.com/talut/rn-secure-storage/issues/53](https://github.com/talut/rn-secure-storage/issues/53) solved.
+
 ### Version 2.0.5
 - [https://github.com/talut/rn-secure-storage/pull/51](https://github.com/talut/rn-secure-storage/pull/51) merged.
 
+
 ### Version 2.0.4
 - [https://github.com/talut/rn-secure-storage/pull/44](https://github.com/talut/rn-secure-storage/pull/44) merged.
 - [https://github.com/talut/rn-secure-storage/pull/46](https://github.com/talut/rn-secure-storage/pull/46) merged.

diff --git a/android/build.gradle b/android/build.gradle
@@ -24,7 +24,11 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
         versionCode 4
+<<<<<<< HEAD
         versionName "2.0.5"
+=======
+        versionName "2.0.6"
+>>>>>>> 1ec951c769b9f2675ebfda3a4387c4a83251331b
     }
     lintOptions {
         abortOnError false

diff --git a/android/src/main/java/com/taluttasgiran/rnsecurestorage/RNSecureStorageModule.java b/android/src/main/java/com/taluttasgiran/rnsecurestorage/RNSecureStorageModule.java
@@ -2,10 +2,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Build;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringDef;
-
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rn-secure-storage",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Secure Storage for React Native (Android & iOS) - Keychain & Keystore",
   "publishConfig": {"registry": "https://npm.pkg.github.com/@talut"},
   "main": "index.js",