edit

Author: thejaswin123

fss/index.html

@@ -294,11 +294,6 @@ <h3 class="arrow-txt">Do you accept <br />the invitation?</h3>
 		</section>
 
 	<!--Timeline--> 
-<<<<<<< HEAD
-		
-	
-=======
->>>>>>> 27875d3a197cc230c3ac86c13fa59960e9325cb4
 	<div id="schedule">
 		<div class="schedule-image">
 			<img class="gif" src="https://fontmeme.com/permalink/220209/96002ada86e392433362c7838f150f7f.png" alt="squid-game-font" >