Resolved conflicts

Ivy-Apps · Apr 24, 2022 · ace1fd9 · ace1fd9
1 parent a277075
commit ace1fd9
Show file tree

Hide file tree

Showing 311 changed files with 5,740 additions and 4,139 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -140,6 +140,8 @@
 -keep class com.ivy.wallet.domain.data.** { *; }
 -keep class com.ivy.wallet.ui.widget.** { *; }
 -keep class com.ivy.wallet.io.network.** { *; }
+-keep class com.ivy.wallet.io.persistence.data.** { *; }
+-keep class com.ivy.wallet.io.network.data.** { *; }
 -keep class com.ivy.wallet.domain.event.** { *; }
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,