OSDN Git Service

fix step2.
authorNknightA <n.knight.pc0627@gmail.com>
Sat, 25 Mar 2023 12:56:13 +0000 (21:56 +0900)
committerNknightA <n.knight.pc0627@gmail.com>
Sat, 25 Mar 2023 12:56:13 +0000 (21:56 +0900)
1  2 
storybooks/.gitignore

@@@ -1,7 -1,4 +1,10 @@@
  <<<<<<< HEAD
++<<<<<<< HEAD
 +node_modules/
 +.storybook/
 +=======
++=======
++>>>>>>> 1f8e9a113c2a49130f8d6b57725145f76236a78e
  # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
  
  # dependencies
@@@ -38,4 -35,7 +41,11 @@@ yarn-error.log
  # typescript
  *.tsbuildinfo
  next-env.d.ts
++<<<<<<< HEAD
 +>>>>>>> 6b012692847da995eaeb27b9c901701397768d3c
++=======
+ =======
+ node_modules/
+ .storybook/
+ >>>>>>> 1546b33afef87d0e0d72a3d3c52b8c2e9b6d0fdd
++>>>>>>> 1f8e9a113c2a49130f8d6b57725145f76236a78e