Merge branch 'master' of /Users/matsumotoayaju/AndroidStudioProjects/Cactus２ with conflicts.

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' of /Users/matsumotoayaju/AndroidStudioProjects/Cactus２ with conflicts. CleanArchitecture ForEasySignUp PlayerFragment RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
1 parent e3be78e commit e84ee9cde77df4d794384ec6b944f97ef0108312 a-matsumoto authored on 14 Jun 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.java

Ignore Space Show notes View app/src/main/res/layout/sign_up_fragment.xml

Show line notes below