Fix merge conflicts

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