Skip to content

Commit c0ff28f

Browse files
yuki-minasplendentengo-nikotafujishiro
authored
Feature/conflict fix (#272)
* fix: ordering files (#271) * ディレクトリ名修正に伴うコンフリクト解消 * fix: renumber directories for lifecycle content insertion (#275) lifecycleコンテンツを `04` として追加するため、以下のディレクトリ番号を繰り上げ: - 04.composition-api → 05.composition-api - 05.components → 06.components - 06.summary → 07.summary" * feat: add lifecycle content (#276) * fix: renumber directories for lifecycle content insertion lifecycleコンテンツを `04` として追加するため、以下のディレクトリ番号を繰り上げ: - 04.composition-api → 05.composition-api - 05.components → 06.components - 06.summary → 07.summary" * feat: add lifecycle content ライフサイクルフックに関するコンテンツを追加 * fix: renumber en directories and add lifecycle content placeholder lifecycle コンテンツを 04 として追加するため、英語版のディレクトリ番号を繰り上げ: - 04.lifecycle を追加 - 04.composition-api → 05.composition-api - 05.components → 06.components - 06.summary → 07.summary * en側のerror-handling移動漏れ修正 * enにhydration追加 * feat: add hydration content. (#281) Co-authored-by: KotaFujishiro <> --------- Co-authored-by: Hikaru Kobayashi <[email protected]> Co-authored-by: ngo-ni <[email protected]> Co-authored-by: kotafujishiro <[email protected]>
1 parent 17b34cb commit c0ff28f

File tree

259 files changed

+1258
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+1258
-0
lines changed

content/en/1.vue/2.reactivity/.template/files/app.vue renamed to content/en/01.vue/02.reactivity/.template/files/app.vue

File renamed without changes.
File renamed without changes.

content/en/1.vue/2.reactivity/.template/solutions/app.vue renamed to content/en/01.vue/02.reactivity/.template/solutions/app.vue

File renamed without changes.

content/en/1.vue/3.reactivity-2/.template/files/app.vue renamed to content/en/01.vue/03.reactivity-2/.template/files/app.vue

File renamed without changes.
File renamed without changes.

content/en/1.vue/3.reactivity-2/.template/solutions/app.vue renamed to content/en/01.vue/03.reactivity-2/.template/solutions/app.vue

File renamed without changes.

0 commit comments

Comments
 (0)