From 95578ee7fbac8454e77194e72c437ef33c2582fa Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 8 Apr 2019 12:58:36 +0200 Subject: [PATCH] fix build --- .../pokeranalytics/android/model/filter/QueryType.kt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt index 816b7895..208760c1 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryType.kt @@ -7,16 +7,6 @@ import net.pokeranalytics.android.model.realm.FilterElement import net.pokeranalytics.android.model.realm.FilterElementBlind import java.util.* -<<<<<<< HEAD -import net.pokeranalytics.android.exceptions.FilterValueMapException -======= -import net.pokeranalytics.android.exceptions.PokerAnalyticsException -import net.pokeranalytics.android.model.realm.FilterElementBlind ->>>>>>> 5301b81ebff84f627ba6b22fdbfa19235a65b218 -import net.pokeranalytics.android.model.realm.FilterElement -import net.pokeranalytics.android.model.realm.FilterElementBlind -import java.util.* - /** * Enum describing the way a query should be handled