2014/index.html: removed the merge conflict text.

diff --git a/2014/index.html b/2014/index.html
index 8eff0db56b954cd20bf6d777c6f67ef3c9426811..8f62c35bf36fdea196948db8e77c0ed0b173d28b 100644 (file)
--- 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">