merge conflicts

dydxprotocol · Apr 11, 2024 · 6eb3596 · 6eb3596
1 parent f06a75b
commit 6eb3596
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -48,11 +48,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-<<<<<<< HEAD
-version = "1.6.41"
-=======
-version = "1.6.40"
->>>>>>> a330d50 (bump version)
+version = "1.6.42"
 
 repositories {
     google()

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/utils/AnalyticsUtils.kt b/src/commonMain/kotlin/exchange.dydx.abacus/utils/AnalyticsUtils.kt
@@ -93,7 +93,6 @@ class AnalyticsUtils {
      * @param existingOrder SubaccountOrder?
      * @param fromSlTpDialog Boolean
      */
-<<<<<<< HEAD
     fun cancelOrderAnalyticsPayload(
         payload: HumanReadableCancelOrderPayload,
         existingOrder: SubaccountOrder?,
@@ -106,9 +105,6 @@ class AnalyticsUtils {
     }
 
     private fun formatCancelOrderPayload(
-=======
-    fun formatCancelOrderPayload(
->>>>>>> 1718d08 (use optimistic execution price)
         payload: HumanReadableCancelOrderPayload,
         fromSlTpDialog: Boolean? = false,
     ): IMap<String, Any>? {

diff --git a/v4_abacus.podspec b/v4_abacus.podspec
@@ -1,10 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-<<<<<<< HEAD
-    spec.version                  = '1.6.41'
-=======
-    spec.version                  = '1.6.40'
->>>>>>> a330d50 (bump version)
+    spec.version                  = '1.6.42'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''