From 0d02bfa51251096eb045810c5f2430100fd37c74 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Fri, 4 Dec 2015 17:48:02 -0500
Subject: [PATCH] Removing scholarship application link from the sidebar.

---
 2016/includes/sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/2016/includes/sidebar.html b/2016/includes/sidebar.html
index abde1d65..45158080 100755
--- a/2016/includes/sidebar.html
+++ b/2016/includes/sidebar.html
@@ -12,6 +12,7 @@
 			<!-- Sidebar items that are commented out
 			<li><a href="/2016/program/exhibit_hall.html">Exhibit hall</a></li>
 
+			<li id="scholarship-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=334&reset=1">Apply for a scholarship</a></li>
 			<li id="volunteer-link"><a href="/2016/volunteer">Volunteer</a></li>
 			<li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2016/Conference_brainstorm">Share Your Conference Ideas</a></li>
 			<li><a href="/2016/live">Livestream & Chat</a></li>
@@ -24,13 +25,12 @@
 
 
 		<ul class="nav nav-pills nav-stacked">
-			<li id="scholarship-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=334&reset=1">Apply for a scholarship</a></li>
 			<li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
 			<li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
+			<li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
 		</ul>
 
 		<ul class="nav nav-pills nav-stacked">
-			<li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
 			<li id="getting_around-link"><a href="/2016/getting_around">Travel info</a></li>
 			<li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</a></li>
 			<li id="ahp-link"><a href="/2016/safe-space-policy/">Safe space policy</a></li>
-- 
2.25.1