From 4f9cd4c7323eb7d70b422f6add612e42c7b134fd Mon Sep 17 00:00:00 2001
From: Alwin1847207
Date: Fri, 8 Nov 2019 22:44:30 +0530
Subject: fixing some merge conflicts that have missed

---
 fossee_manim/templates/fossee_manim/about.html      | 13 -------------
 fossee_manim/templates/fossee_manim/honorarium.html | 15 ---------------
 fossee_manim/templates/fossee_manim/outreach.html   |  9 ---------
 3 files changed, 37 deletions(-)

diff --git a/fossee_manim/templates/fossee_manim/about.html b/fossee_manim/templates/fossee_manim/about.html
index 4688740..3ce076d 100644
--- a/fossee_manim/templates/fossee_manim/about.html
+++ b/fossee_manim/templates/fossee_manim/about.html
@@ -5,16 +5,10 @@ About
 {% endblock %}
 
 {% block content %}
-<<<<<<< HEAD
 <div class="container-fluid jumbotron" align="justify"
 	style="margin-top:20px; padding:50px; background-color: transparent;">
 	<!-- style="padding-top:120px"> -->
 	<center>
-=======
-	<div class="container-fluid jumbotron" align = "justify" style="margin-top:20px; margin-bottom: 56px; padding:50px; background-color: transparent;">
-		 {% comment %}style="padding-top:120px"> {% endcomment %}
-		 <center>
->>>>>>> cfdc41deed280bddbcc6c3cf45e30f33ea139e88
 		<h1>About FOSSEE Animations</h1>
 		<h4 style="color: #555555;"><i>What</i> do we do and <i>why</i>?</h4>
 	</center>
@@ -22,12 +16,5 @@ About
 	<div class="container" style="font-family: 'Lato', sans-serif; background-color: #e7edee;">
 		<hr>
 	</div>
-<<<<<<< HEAD
 </div>
 {% endblock content %}
-=======
-    <div>
-        {% endblock content %}
-    </div>
-
->>>>>>> cfdc41deed280bddbcc6c3cf45e30f33ea139e88
diff --git a/fossee_manim/templates/fossee_manim/honorarium.html b/fossee_manim/templates/fossee_manim/honorarium.html
index b844482..968ff87 100644
--- a/fossee_manim/templates/fossee_manim/honorarium.html
+++ b/fossee_manim/templates/fossee_manim/honorarium.html
@@ -64,7 +64,6 @@ Honorarium
 					you do not receive your money within 45 days of acknowledgement of forms received, please feel free
 					to contact us; we are happy to assist you.</li>
 			</ol>
-<<<<<<< HEAD
 			<p><span>Please note that the honorarium processing only starts after we receive your completed honorarium
 					forms. Ensure that you have made a PAN card and submit the forms in time to avoid delays.</span>
 				<p>
@@ -83,20 +82,6 @@ Honorarium
 										Form </a> </li>
 								<li> <a href="https://static.fossee.in/animations/forms/Receipt.pdf"> Receipt </a> </li>
 							</ul>
-=======
-			<p><span>Please note that the honorarium processing only starts after we receive your completed honorarium forms. Ensure that you have made a PAN card and submit the forms in time to avoid delays.</span><p>
-			<br> <br>
-			<h2><center>Forms</center></h2>
-			<br>
-			<p>Kindly print out the forms below, fill the required fields and mail them to the address:<p>
-			<ul>
-				<li> <a style="color: blue" href = "https://static.fossee.in/animations/forms/Copyright_Transfer.pdf"> Copyright Transfer Form </a> </li>
-				<li> <a style="color: blue" href = "https://static.fossee.in/animations/forms/Contributor_Details.pdf"> Contributor Details Form </a> </li>
-				<li> <a style="color: blue" href = "https://static.fossee.in/animations/forms/Bank_Details.pdf"> Bank Details Form </a> </li>
-				<li> <a style="color: blue" href = "https://static.fossee.in/animations/forms/Receipt.pdf"> Receipt </a> </li>
-			</ul>
-		</div>
->>>>>>> cfdc41deed280bddbcc6c3cf45e30f33ea139e88
 	</div>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/fossee_manim/templates/fossee_manim/outreach.html b/fossee_manim/templates/fossee_manim/outreach.html
index f0314eb..2bdf740 100644
--- a/fossee_manim/templates/fossee_manim/outreach.html
+++ b/fossee_manim/templates/fossee_manim/outreach.html
@@ -5,18 +5,9 @@ FOSSEE Animations | Outreach
 {% endblock %}
 
 {% block content %}
-<<<<<<< HEAD
-<div class="container-fluid jumbotron" align="justify" style="background-color: transparent">
-	<center>
-		<h2>FOSSEE Animations Outreach</h2>
-	</center>
-	<hr>
-</div>
-=======
 	<div class="container-fluid jumbotron" align = "justify" style="background-color: transparent; margin-bottom: 103px; ">
 		<center><h2>FOSSEE Animations Outreach</h2></center>
 		<hr>
 	</div>
->>>>>>> cfdc41deed280bddbcc6c3cf45e30f33ea139e88
 
 {% endblock %}
\ No newline at end of file
-- 
cgit