From aa7c243e6754df41dcd60f46d454e4458eb12530 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Mon, 1 Dec 2014 10:37:02 -0500
Subject: [PATCH] Taking down scholarship links.

---
 2015/index.html          | 11 +++++++----
 server/2015/sidebar.html |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/2015/index.html b/2015/index.html
index a0e7cbb0..5fc1a77e 100755
--- a/2015/index.html
+++ b/2015/index.html
@@ -30,16 +30,19 @@
 				  </p>
 				</li>
 				
-				<li class="item">
+				
+</ul>
+<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
+
+<!--
+
+<li class="item">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 					   alt="[ Apply for a scholarship ]">
 			<p class="lead carousel-caption-tl"> <a href="scholarships">Apply for a travel scholarship</a> by November 30th or <a href="https://www.libreplanet.org/2015/scholarship_donation">donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
 					  </p>
 				</li>
-</ul>
-<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
 
-<!--
 <li class="item active">
 				  <img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/crockford_and_levy_2014.jpg"
 					   alt="[ Two speakers at LibrePlanet 2014]">
diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index 6e14e3b6..2fc2e84b 100755
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -15,7 +15,7 @@
               <!--<li><a href="/2015/program/exhibit_hall.html">Exhibit hall</a></li>-->
               <li id="exhibit-link"><a href="/2015/exhibit">Join the Exhibit Hall</a></li>
               <li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
-              <li id="scholarship-link"><a href="/2015/scholarships">Apply for a Scholarship</a></li>
+              <!--<li id="scholarship-link"><a href="/2015/scholarships">Apply for a Scholarship</a></li>-->
 
 
 
-- 
2.25.1