마이페이지 제작 #3

likelionDigimon · Aug 1, 2023 · 539399c · 539399c
1 parent 02c4bde
commit 539399c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/component/project/mypage/component.js b/src/component/project/mypage/component.js
@@ -6,7 +6,10 @@ export const BackgroundContainer = styled.div`
   width: 1920px;
   height: 100vh;
   flex-direction: column;
+<<<<<<< Updated upstream
   background: #76116f;
+=======
+>>>>>>> Stashed changes
   overflow-y: auto;
 `;
 export const Title = styled.div`