From: NknightA <n.knight.pc0627@gmail.com>
Date: Sat, 25 Mar 2023 03:03:18 +0000 (+0900)
Subject: update.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e1f9c842641cd263184f02e18f56ef7671a48263;p=projectv%2Fserver.git

update.
---

e1f9c842641cd263184f02e18f56ef7671a48263
diff --cc storybooks/.gitignore
index c87c9b3,eb2c7b9..90cbf5f
--- a/storybooks/.gitignore
+++ b/storybooks/.gitignore
@@@ -1,36 -1,2 +1,41 @@@
++<<<<<<< HEAD
 +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 +
 +# dependencies
 +/node_modules
 +/.pnp
 +.pnp.js
 +
 +# testing
 +/coverage
 +
 +# next.js
 +/.next/
 +/out/
 +
 +# production
 +/build
 +
 +# misc
 +.DS_Store
 +*.pem
 +
 +# debug
 +npm-debug.log*
 +yarn-debug.log*
 +yarn-error.log*
 +.pnpm-debug.log*
 +
 +# local env files
 +.env*.local
 +
 +# vercel
 +.vercel
 +
 +# typescript
 +*.tsbuildinfo
 +next-env.d.ts
++=======
+ node_modules/
+ .storybook/
++>>>>>>> 1546b33afef87d0e0d72a3d3c52b8c2e9b6d0fdd