Update index.svelte

prityusha · Oct 1, 2020 · 81a3234 · 81a3234
1 parent d33804b
commit 81a3234
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
@@ -137,16 +137,13 @@
       grid-template-columns: auto auto;
     }
 
-<<<<<<< HEAD
-=======
     #social > a{
       font-size: 1.1rem;
     }
 
     .section-about{
       height: 100vh;
     }
->>>>>>> 920c15c... Add About section in mobile design and some positioning fixes
 
     .about-us{
     width: 100%;