fix merge conflict

Author: Mansi-mParticle

android-core/proguard.pro

@@ -250,7 +250,6 @@
     public static final ** CREATOR;
 }
 
-<<<<<<< feat/SQDSDKS-7068-gradle-8
 # Firebase and GMS CloudMessaging
 -dontwarn com.google.android.gms.cloudmessaging.**
 -dontwarn com.google.firebase.messaging.**
@@ -277,7 +276,6 @@
 -keepclassmembers class * {
     @kotlin.Metadata <methods>;
 }
-=======
 -keepclassmembers class com.mparticle.Rokt {
     <init>(...);
     void *(...);
@@ -291,4 +289,3 @@
 -keep class com.mparticle.RoktEvent { *; }
 -keepclassmembers class com.mparticle.RoktEvent { *; }
 -keepclasseswithmembers class com.mparticle.RoktEvent$* { *; }
->>>>>>> development