Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt

@@ -40,7 +40,6 @@ open class Filter : RealmObject() {
 			return realm.where<Filter>().equalTo("id", filterId).findFirst()
 		}
 
-<<<<<<< HEAD
 	    @TestOnly
 	    inline fun <reified T : Filterable> queryOn(realm: Realm, queries: List<QueryCondition>): RealmResults<T> {
 		    var realmQuery = realm.where<T>()
@@ -51,17 +50,6 @@ open class Filter : RealmObject() {
 		    return realmQuery.findAll()
 	    }
     }
-=======
-		@TestOnly
-		inline fun <reified T : Filterable> queryOn(realm: Realm, queries: List<QueryCondition>): RealmResults<T> {
-			var realmQuery = realm.where<T>()
-			queries.forEach {
-				realmQuery = it.filter<T>(realmQuery)
-			}
-			return realmQuery.findAll()
-		}
-	}
->>>>>>> d92e2a30b3498d0b6d57197c93b188e100151f1c
 
 	@PrimaryKey
 	var id = UUID.randomUUID().toString()