Merge pull request #53 from alittlekitten/feat/optimize1

HOTFIX : v1.5.1 merge conflict 해결
alittlekitten · Apr 9, 2022 · ab5f79b · ab5f79b
2 parents ed7e707 + 1ed59a7
commit ab5f79b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -98,11 +98,8 @@ interface ViewportProps {
 const Viewport = (props: ViewportProps) => css`
   width: 100vw;
   height: 100vh;
-<<<<<<< HEAD
-=======
   min-width: 500px;
   min-height: 720px;
->>>>>>> 65426d09ca1a5b2a4610620402a3ad1934168b4c
   background-color: ${props.themeStatus === "light"
     ? props.timerStatus === "play" &&
       props.timerHour === 0 &&

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -35,11 +35,7 @@ const Header = () => {
   return (
     <div>
       <div css={main(theme)}>
-<<<<<<< HEAD
-        <span className="version">Ssoco Timer v1.5.0 </span>
-=======
         <span className="version">Ssoco Timer v1.5.1 </span>
->>>>>>> 65426d09ca1a5b2a4610620402a3ad1934168b4c
 
         <div className="icons">
           <span className="copyright">

diff --git a/src/index.css b/src/index.css
@@ -1,11 +1,8 @@
 body,
 html {
   margin: 0;
-<<<<<<< HEAD
-=======
   width: 100%;
   height: 100%;
->>>>>>> 65426d09ca1a5b2a4610620402a3ad1934168b4c
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
     "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
     sans-serif;