Putting up registration button in place of announcements sign up and changing its...

diff --git a/2015/index.html b/2015/index.html
index 79c6cc25b640169d73fa0817a8418b4901ef5d4e..d6a956b93129b8b96ad024a81b94eebd93e19372 100755 (executable)
--- 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>