From f4f37434bd6234b1a1cbefb4f2e22c872c069595 Mon Sep 17 00:00:00 2001
From: rsiddharth <rsd@gnu.org>
Date: Mon, 25 Nov 2013 22:44:09 +0530
Subject: [PATCH] server/staging/lpc14/index.html: replaced signup form with
 register button

---
 2014/index.html | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/2014/index.html b/2014/index.html
index f7c0ff30..7c60c566 100644
--- a/2014/index.html
+++ b/2014/index.html
@@ -15,7 +15,7 @@
 	  <div class="lp-banner"> <!--start of lp banner -->
 		<div class="container"> <!-- start of container -->
 		  <div class="row">
-			<div class="col-sm-7"> <!-- start of lp header -->
+			<div class="col-sm-9"> <!-- start of lp header -->
 			  <div class="lp-head">
 				<h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
 				<p><strong>March 22nd-23rd 2014 in Cambridge, MA</strong></p>
@@ -135,7 +135,23 @@
 					</a>
 				  </p>
 				</li>
+<<<<<<< HEAD:2014/index.html
 <li class="item">
+=======
+				<li class="item">
+				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-room-110.jpg"
+					   alt="[ LibrePlanet 2013 discussion ]">
+				  <p class="lead carousel-caption-bl">
+					We're collecting suggestions for LibrePlanet 2014
+					
+					<a class="btn btn-default"
+					   href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm">
+					  Share your ideas
+					</a>
+				  </p>
+				</li>
+				<li class="item">
+>>>>>>> server/staging/lpc14/index.html: replaced signup form with register button:server/staging/lpc14/index.html
 				  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-presentation.jpg"
 					   alt="[ A presentation at LibrePlanet 2013]">
 				  	  <p class="lead carousel-caption-tr">
-- 
2.25.1