fix merging remains

mnalis · Nov 15, 2024 · 735f681 · 735f681
1 parent 8721a62
commit 735f681
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestsModule.kt
@@ -32,11 +32,8 @@ import de.westnordost.streetcomplete.quests.barrier_type.AddBarrierType
 import de.westnordost.streetcomplete.quests.barrier_type.AddStileType
 import de.westnordost.streetcomplete.quests.bbq_fuel.AddBbqFuel
 import de.westnordost.streetcomplete.quests.bench_backrest.AddBenchBackrest
-<<<<<<< HEAD
 import de.westnordost.streetcomplete.quests.bench_material.AddBenchMaterial
-=======
 import de.westnordost.streetcomplete.quests.bicycle_repair_station.AddBicycleRepairStationServices
->>>>>>> bicycle_repair_equipment
 import de.westnordost.streetcomplete.quests.bike_parking_capacity.AddBikeParkingCapacity
 import de.westnordost.streetcomplete.quests.bike_parking_cover.AddBikeParkingCover
 import de.westnordost.streetcomplete.quests.bike_parking_type.AddBikeParkingType