result画面からの遷移(ゲームリセット)と画像の追加&ファイルアップロード実装 #26
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nonofefe
approved these changes
Jul 31, 2020
|
自分のにマージしました |
wabetarou
approved these changes
Aug 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
修正箇所は以下．
これに伴い．Cardクラスのフィールドであるfilenameを拡張子込みに修正し，jpgに限らないようにした．
動作確認よろ
@gangigammo そっちのプルリクとコンフリクト起きる可能性大なので解消のためのマージよろ