Merge remote-tracking branch 'origin/master' into LogTest

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into LogTest # Conflicts: # .idea/misc.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 filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit c60ae6c3ab1e913fe63da1f2bd9379da3c3a198e 2 parents 50d0f84 + 4660a8f k-kimoto authored on 22 Jun 2023

Browse code

# Conflicts:
#	.idea/misc.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 filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit c60ae6c3ab1e913fe63da1f2bd9379da3c3a198e

2 parents 50d0f84 + 4660a8f

k-kimoto authored on 22 Jun 2023

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View .idea/misc.xml

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

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

Show line notes below