fix build

7 years ago · 95578ee7fb
parent 1696ed4269
commit 95578ee7fb
1 changed files with 0 additions and 10 deletions
--- 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