Fix merge conflicts

7 years ago · 5ac506ac47
parent 298cb671d1
commit 5ac506ac47
1 changed files with 1 additions and 1 deletions
--- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
@ -91,7 +91,7 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row

                val objects = mutableListOf<QueryCondition.CustomFieldNumberQuery>()
                distincts.distinct().mapNotNull {
-                  it.numericValue
+                    it.numericValue
                }.forEach {value ->
                    val condition: QueryCondition.CustomFieldNumberQuery = QueryCondition.CustomFieldNumberQuery().apply {
                        this.customFieldId = this@ListCriteria.customField.id