GitBucket
|
Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into MainActivity2
# Conflicts: # app/src/main/AndroidManifest.xml |
|---|
|
|
| app/src/main/AndroidManifest.xml |
|---|
| app/src/main/java/com/example/tampopo_client/views/LaunchActivity.java 0 → 100644 |
|---|
| app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java 0 → 100644 |
|---|
| app/src/main/res/layout/activity_launch.xml 0 → 100644 |
|---|
| app/src/main/res/layout/activity_register.xml 0 → 100644 |
|---|