From 7434f8805724d9e5fef8a8032db5f643a8cb44d9 Mon Sep 17 00:00:00 2001
From: rsiddharth <rsd@gnu.org>
Date: Mon, 25 Nov 2013 23:04:16 +0530
Subject: [PATCH] 2014/index.html: removed the merge conflict text.

---
 2014/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/2014/index.html b/2014/index.html
index 8eff0db5..8f62c35b 100644
--- a/2014/index.html
+++ b/2014/index.html
@@ -135,9 +135,6 @@
 					</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 ]">
@@ -151,7 +148,6 @@
 				  </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