mereged

2020-11-22 18:24:24 +01:00
parent f75dcb668a b687b3c014
commit 3ab2674cb3
6 changed files with 30 additions and 23 deletions
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@ -8,9 +8,16 @@ import styled from 'styled-components';
 const Wrapper = styled.div`
  display: flex;
  height: calc(100vh - 80px);
+<<<<<<< HEAD
  background-color: #eceef4;
  padding-top: 20px;
  padding-bottom: 20px;
+=======
+  background-color: #ECEEF4;
+  padding-top:20px;
+  padding-bottom:20px;
+  padding-right:20px;
+>>>>>>> b687b3c014cabbedb9233d5f33e42d461a04a047
 `;

 export const App = () => {