From f1f7c7a8a63b68fa0f3fd486cf909a397441ea6f Mon Sep 17 00:00:00 2001 From: NamKyeongMin Date: Wed, 7 May 2025 20:36:45 +0900 Subject: [PATCH] Merge frontend into frontend_km and resolve conflict --- frontend/src/components/InputBlock.jsx | 2 +- .../components/componentsCss/{InfoBlock.css => InputBlock.css} | 0 frontend/yarn.lock | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename frontend/src/components/componentsCss/{InfoBlock.css => InputBlock.css} (100%) diff --git a/frontend/src/components/InputBlock.jsx b/frontend/src/components/InputBlock.jsx index 18acb60..63a1607 100644 --- a/frontend/src/components/InputBlock.jsx +++ b/frontend/src/components/InputBlock.jsx @@ -1,5 +1,5 @@ import React from "react"; -import "./componentsCss/InfoBlock.css"; +import "./componentsCss/InputBlock.css"; const InputBlock = ({ inputs }) => { return ( diff --git a/frontend/src/components/componentsCss/InfoBlock.css b/frontend/src/components/componentsCss/InputBlock.css similarity index 100% rename from frontend/src/components/componentsCss/InfoBlock.css rename to frontend/src/components/componentsCss/InputBlock.css diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 736512a..57037e2 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1047,7 +1047,7 @@ lru-cache@^5.1.1: lucide-react@^0.507.0: version "0.507.0" - resolved "https://registry.npmjs.org/lucide-react/-/lucide-react-0.507.0.tgz" + resolved "https://registry.yarnpkg.com/lucide-react/-/lucide-react-0.507.0.tgz#d93a75ed130bd530a368fe1dd4ea009ea90a772b" integrity sha512-XfgE6gvAHwAtnbUvWiTTHx4S3VGR+cUJHEc0vrh9Ogu672I1Tue2+Cp/8JJqpytgcBHAB1FVI297W4XGNwc2dQ== minimatch@^3.1.2: