ろむねこ
db83de7a37
# Conflicts: # feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java # feature/parent/src/main/res/layout/fragment_parent_main.xml # feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java # gradle/libs.versions.toml |
||
---|---|---|
.. | ||
wrapper | ||
libs.versions.toml |