From 9d8d79a1b14d28e602ee498e83b951b4d018c055 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Fri, 10 Oct 2014 18:04:42 -0400
Subject: [PATCH] Putting up registration button in place of announcements sign
 up and changing its color to a different shade of green for 2015.

---
 2015/index.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/2015/index.html b/2015/index.html
index 79c6cc25..d6a956b9 100755
--- a/2015/index.html
+++ b/2015/index.html
@@ -15,11 +15,6 @@
 			</div>
 			-->
 
-	<ul id="lp-updates" class="list-group pull-right">
-<<<<<<< HEAD
-	  <li class="list-group-item"><a href="https://www.fsf.org/blogs/community/libreplanet-is-coming-march-21-22-215-propose-a-session">Call for Sessions open until November 2nd. We're also accepting exhibitors and volunteers.</a>
-</li>
-
 
   <p class="lead">LibrePlanet is an annual conference for free software enthusiasts. LibrePlanet brings together software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2015 will feature programming for all ages and experience levels.</p>
 
-- 
2.25.1