git er rompe
Merge branch 'master' of https://github.com/Naiv/android14-gruppe16

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	app/build/apk/app-debug-unaligned.apk

	app/build/classes/debug/com/gruppe16/bensinkalkulator/MainActivity$1.class

	app/build/classes/debug/com/gruppe16/bensinkalkulator/MainActivity.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R$id.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R$integer.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R$layout.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R$menu.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R$string.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R$style.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R$styleable.class
	app/build/classes/debug/com/gruppe16/bensinkalkulator/R.class
	app/build/dex/debug/classes.dex
	app/build/incremental/mergeResources/debug/merger.xml
	app/build/libs/app-debug.ap_
	app/build/manifests/debug/AndroidManifest.xml

	app/build/res/all/debug/drawable-hdpi/abc_ab_bottom_solid_dark_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_bottom_solid_light_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_bottom_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_bottom_transparent_light_holo.9.png
	app/build/res/all/debug/drawable-hdpi/abc_ab_share_pack_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_share_pack_holo_light.9.png
	app/build/res/all/debug/drawable-hdpi/abc_ab_solid_dark_holo.9.png
	app/build/res/all/debug/drawable-hdpi/abc_ab_solid_light_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_stacked_solid_dark_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_stacked_solid_light_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_stacked_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_stacked_transparent_light_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_ab_transparent_light_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_cab_background_bottom_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_cab_background_bottom_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_cab_background_top_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_cab_background_top_holo_light.9.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_ab_back_holo_dark.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_ab_back_holo_light.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_cab_done_holo_dark.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_cab_done_holo_light.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_clear_disabled.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_clear_normal.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_clear_search_api_disabled_holo_light.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_clear_search_api_holo_light.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_commit_search_api_holo_dark.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_commit_search_api_holo_light.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_go.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_go_search_api_holo_light.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_menu_moreoverflow_normal_holo_dark.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_menu_moreoverflow_normal_holo_light.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_menu_share_holo_dark.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_menu_share_holo_light.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_search.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_search_api_holo_light.png
	app/build/res/all/debug/drawable-hdpi/abc_ic_voice_search.png

	app/build/res/all/debug/drawable-hdpi/abc_ic_voice_search_api_holo_light.png
	app/build/res/all/debug/drawable-hdpi/abc_list_divider_holo_dark.9.png
	app/build/res/all/debug/drawable-hdpi/abc_list_divider_holo_light.9.png
	app/build/res/all/debug/drawable-hdpi/abc_list_focused_holo.9.png
	app/build/res/all/debug/drawable-hdpi/abc_list_longpressed_holo.9.png
	app/build/res/all/debug/drawable-hdpi/abc_list_pressed_holo_dark.9.png
	app/build/res/all/debug/drawable-hdpi/abc_list_pressed_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_menu_dropdown_panel_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_menu_dropdown_panel_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_menu_hardkey_panel_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_menu_hardkey_panel_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_default_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_default_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_disabled_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_disabled_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_focused_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_focused_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_pressed_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_spinner_ab_pressed_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_tab_selected_focused_holo.9.png
	app/build/res/all/debug/drawable-hdpi/abc_tab_selected_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_tab_selected_pressed_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_tab_unselected_pressed_holo.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_default_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_default_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_right_default_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_right_default_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_right_selected_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_right_selected_holo_light.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_selected_holo_dark.9.png

	app/build/res/all/debug/drawable-hdpi/abc_textfield_search_selected_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_bottom_solid_dark_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_bottom_solid_light_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_bottom_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_bottom_transparent_light_holo.9.png
	app/build/res/all/debug/drawable-mdpi/abc_ab_share_pack_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_share_pack_holo_light.9.png
	app/build/res/all/debug/drawable-mdpi/abc_ab_solid_dark_holo.9.png
	app/build/res/all/debug/drawable-mdpi/abc_ab_solid_light_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_stacked_solid_dark_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_stacked_solid_light_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_stacked_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_stacked_transparent_light_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_ab_transparent_light_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_cab_background_bottom_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_cab_background_bottom_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_cab_background_top_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_cab_background_top_holo_light.9.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_ab_back_holo_dark.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_ab_back_holo_light.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_cab_done_holo_dark.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_cab_done_holo_light.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_clear_disabled.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_clear_normal.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_clear_search_api_disabled_holo_light.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_clear_search_api_holo_light.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_commit_search_api_holo_dark.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_commit_search_api_holo_light.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_go.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_go_search_api_holo_light.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_menu_moreoverflow_normal_holo_dark.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_menu_moreoverflow_normal_holo_light.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_menu_share_holo_dark.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_menu_share_holo_light.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_search.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_search_api_holo_light.png
	app/build/res/all/debug/drawable-mdpi/abc_ic_voice_search.png

	app/build/res/all/debug/drawable-mdpi/abc_ic_voice_search_api_holo_light.png
	app/build/res/all/debug/drawable-mdpi/abc_list_divider_holo_dark.9.png
	app/build/res/all/debug/drawable-mdpi/abc_list_divider_holo_light.9.png
	app/build/res/all/debug/drawable-mdpi/abc_list_focused_holo.9.png
	app/build/res/all/debug/drawable-mdpi/abc_list_longpressed_holo.9.png
	app/build/res/all/debug/drawable-mdpi/abc_list_pressed_holo_dark.9.png
	app/build/res/all/debug/drawable-mdpi/abc_list_pressed_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_menu_dropdown_panel_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_menu_dropdown_panel_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_menu_hardkey_panel_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_menu_hardkey_panel_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_default_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_default_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_disabled_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_disabled_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_focused_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_focused_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_pressed_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_spinner_ab_pressed_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_tab_selected_focused_holo.9.png
	app/build/res/all/debug/drawable-mdpi/abc_tab_selected_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_tab_selected_pressed_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_tab_unselected_pressed_holo.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_default_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_default_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_right_default_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_right_default_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_right_selected_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_right_selected_holo_light.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_selected_holo_dark.9.png

	app/build/res/all/debug/drawable-mdpi/abc_textfield_search_selected_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_bottom_solid_dark_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_bottom_solid_light_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_bottom_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_bottom_transparent_light_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_share_pack_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_share_pack_holo_light.9.png
	app/build/res/all/debug/drawable-xhdpi/abc_ab_solid_dark_holo.9.png
	app/build/res/all/debug/drawable-xhdpi/abc_ab_solid_light_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_stacked_solid_dark_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_stacked_solid_light_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_stacked_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_stacked_transparent_light_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_transparent_dark_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_ab_transparent_light_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_cab_background_bottom_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_cab_background_bottom_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_cab_background_top_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_cab_background_top_holo_light.9.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_ab_back_holo_dark.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_ab_back_holo_light.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_cab_done_holo_dark.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_cab_done_holo_light.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_clear_disabled.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_clear_search_api_disabled_holo_light.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_clear_search_api_holo_light.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_commit_search_api_holo_dark.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_commit_search_api_holo_light.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_go.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_go_search_api_holo_light.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_menu_moreoverflow_normal_holo_dark.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_menu_moreoverflow_normal_holo_light.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_menu_share_holo_dark.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_menu_share_holo_light.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_search.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_search_api_holo_light.png
	app/build/res/all/debug/drawable-xhdpi/abc_ic_voice_search.png

	app/build/res/all/debug/drawable-xhdpi/abc_ic_voice_search_api_holo_light.png
	app/build/res/all/debug/drawable-xhdpi/abc_list_divider_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_list_divider_holo_light.9.png
	app/build/res/all/debug/drawable-xhdpi/abc_list_focused_holo.9.png
	app/build/res/all/debug/drawable-xhdpi/abc_list_longpressed_holo.9.png
	app/build/res/all/debug/drawable-xhdpi/abc_list_pressed_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_list_pressed_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_menu_dropdown_panel_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_menu_dropdown_panel_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_menu_hardkey_panel_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_menu_hardkey_panel_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_default_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_default_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_disabled_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_disabled_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_focused_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_focused_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_pressed_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_spinner_ab_pressed_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_tab_selected_focused_holo.9.png
	app/build/res/all/debug/drawable-xhdpi/abc_tab_selected_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_tab_selected_pressed_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_tab_unselected_pressed_holo.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_default_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_default_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_right_default_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_right_default_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_right_selected_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_right_selected_holo_light.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_selected_holo_dark.9.png

	app/build/res/all/debug/drawable-xhdpi/abc_textfield_search_selected_holo_light.9.png
	app/build/res/all/debug/layout/fragment_main_track.xml
	app/build/source/r/debug/com/gruppe16/bensinkalkulator/R.java
	app/build/symbols/debug/R.txt
	app/src/main/java/com/gruppe16/bensinkalkulator/MainActivity.java