From 81a3234032b2644d62ba781e3d7dca8abd613720 Mon Sep 17 00:00:00 2001
From: Ishan <ishansaini243@gmail.com>
Date: Thu, 1 Oct 2020 09:39:22 +0530
Subject: [PATCH] Update index.svelte

---
 src/routes/index.svelte | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 60fe691..ee7eb05 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -137,8 +137,6 @@
       grid-template-columns: auto auto;
     }
 
-<<<<<<< HEAD
-=======
     #social > a{
       font-size: 1.1rem;
     }
@@ -146,7 +144,6 @@
     .section-about{
       height: 100vh;
     }
->>>>>>> 920c15c... Add About section in mobile design and some positioning fixes
 
     .about-us{
     width: 100%;