nitta-lab-2024:master
nitta-lab-2024:setting3
# Conflicts: # app/src/main/java/com/example/citrusclient/views/SettingsFragment.java