m

androidExampleDemo/app/proguard-rules.pro

@@ -1,6 +1,7 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
 # proguardFiles setting in build.gradle.
+<<<<<<< HEAD
 
 # Retrofit
 -keepattributes Signature, InnerClasses, EnclosingMethod
@@ -31,3 +32,23 @@
 
 # Keep model classes
 -keep class com.example.agentclient.models.** { *; }
+=======
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+>>>>>>> 7c5f94d47066e9f9fb4cd23e74fe34d53d326684