# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/de/edotzlaff/schockwelle/EarthquakeMapsActivity.java # app/src/main/java/de/edotzlaff/schockwelle/SensorMapsActivity.java # app/src/main/res/layout/activity_earthquake_maps.xmlSubWorker