コンフリクトを修正

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code コンフリクトを修正 README master
1 parent 9049304 commit 75528833462a29ce958e87d154eaab98f3f5267f d-matsuura authored on 4 Nov 2021

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java

Show notes View app/src/main/res/layout/activity_follow_list.xml 100644 → 0

Show notes View app/src/main/res/layout/activity_follower_list.xml 100644 → 0

Show line notes below