Skip to content

コンフリクトの解消#10

Closed
mrs1669 wants to merge 7 commits intodevelopfrom
fix/conflict
Closed

コンフリクトの解消#10
mrs1669 wants to merge 7 commits intodevelopfrom
fix/conflict

Conversation

@mrs1669
Copy link
Copy Markdown

@mrs1669 mrs1669 commented Dec 18, 2021

#9 のPRでのConflictした,画像(logo.png)とindex.phpを解消するためのPRです

@mrs1669
Copy link
Copy Markdown
Author

mrs1669 commented Apr 3, 2024

ずっと前からPR出したままになっていましたので、Closeしますね🙏

@mrs1669 mrs1669 closed this Apr 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant