Merge develop into main #176
Merged
Conversation
This file contains hidden or 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
* [fix] Fix date for closing application from Sat to Tue (#65) (#66) * feat: community booth section (#67) * feat: specified commercial transaction (#71) * feat: specified commercial transaction * fix typo * fix: i18n locale * fix: english explanation --------- Co-authored-by: Taiga KIYOKAWA <40013676+taigakiyokawa@users.noreply.github.com>
* [fix] Fix date for closing application from Sat to Tue (#65) (#66) * feat: community booth section (#67) * feat: specified commercial transaction (#71) * feat: specified commercial transaction * fix typo * fix: i18n locale * fix: english explanation * feat: add information about CfP result (#165) --------- Co-authored-by: Taiga KIYOKAWA <40013676+taigakiyokawa@users.noreply.github.com>
* feat: useSettionize * add EOL
* feat: partner page * SAMPLE json / images * fix: `desc` to `description` * fix: simplify prop type name * fix: `desc` to `description` * fix: extract params from context
…build by Sessionize (#173) * chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize * chore: Temporarily change links of Header to the links to HTML pages build by Sessionize * fix(HeaderMenu): Use `next/link` when href is `/`
* feat: hide home label from header * fix header menu * comment out unused import
| return ( | ||
| <Layout> | ||
| <MainVisual /> | ||
| <TopDescription /> | ||
| <SpeakersSection /> | ||
| <SponsorsSection /> | ||
| <CommunityBoothSection /> |
There was a problem hiding this comment.
コンフリクト解消のタイミングで CommunityBoothSection を削除した対応 (#174) が巻き戻っていそうです。
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.
src/components/pages/PageTop/index.tsx のコンフリクトを解消し、動作確認するためにローカルで操作しました
developブランチをmainブランチにマージします