Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into logon_sign

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into logon_sign_act Conflicts: .idea/misc.xml app/src/main/AndroidManifest.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit c97f24c0a0ac174b0347a1b5f29537c1cf44ce07 2 parents e08aba5 + 2fcedb3 k-kimoto authored on 13 Jun 2023

Browse code

Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into logon_sign_act

Conflicts:
	.idea/misc.xml
	app/src/main/AndroidManifest.xml

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit c97f24c0a0ac174b0347a1b5f29537c1cf44ce07

2 parents e08aba5 + 2fcedb3

k-kimoto authored on 13 Jun 2023

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MainActivity.java

Show notes View app/src/main/res/drawable/icon.jpg 100644 → 0

Ignore Space Show notes View app/src/main/res/drawable/icon_current.jpg 0 → 100644

Show line notes below