merge conflict

customerio · Nov 19, 2024 · 3c0f885 · 3c0f885
1 parent 9a02173
commit 3c0f885
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/android/src/main/kotlin/io/customer/customer_io/CustomerIoPlugin.kt b/android/src/main/kotlin/io/customer/customer_io/CustomerIoPlugin.kt
@@ -210,7 +210,6 @@ class CustomerIoPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
                 metric = event
             )
         )
-         */
     }
 
     private fun setDeviceAttributes(params: Map<String, Any>) {

diff --git a/lib/customer_io_const.dart b/lib/customer_io_const.dart
@@ -17,6 +17,7 @@ class MethodConsts {
 
 class TrackingConsts {
   static const String userId = "userId";
+  static const String attributes = "attributes";
   static const String traits = "traits";
   static const String eventName = "eventName";
   static const String token = "token";
-Original file line number
+Diff line change
@@ Expand Up @@
                     metric = event
                 )
             )
-             */
         }
         private fun setDeviceAttributes(params: Map<String, Any>) {
@@ Expand Down @@