From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Mon, 22 Sep 2014 15:15:20 +0000 (-0400)
Subject: Resolving merge conflicts caused by silly workflow.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=79cf337414ea1c2b9b444fc7ad7fabad008d60a4;p=libreplanet-static.git

Resolving merge conflicts caused by silly workflow.
---

79cf337414ea1c2b9b444fc7ad7fabad008d60a4
diff --cc 2015/index.html
index 22ee876c,d8c116bc..79c6cc25
--- a/2015/index.html
+++ b/2015/index.html
@@@ -16,9 -16,22 +16,10 @@@
  			-->
  
  	<ul id="lp-updates" class="list-group pull-right">
 -	  <li class="list-group-item">
 -		<span class="label label-primary">
 -		  Heads up!</span> Lorem ipsum dolor sit amet, consectetur
 -		adipiscing elit. Mauris eget fermentum risus. Morbi rutrum
 -		consequat euismod.</li>
 -	  <li class="list-group-item">
 -		<span class="label label-success">
 -		  News</span> LP15 news! Lorem ipsum dolor sit amet,
 -		consectetur adipiscing elit. Mauris eget fermentum
 -		risus. Morbi rutrum consequat euismod.</li>
 -	  <li class="list-group-item">
 -		<span class="label label-danger">
 -		  Gotcha!</span> Gotcha and time sensitive info. Lorem ipsum dolor sit
 -		amet, consectetur adipiscing elit. Mauris eget fermentum
 -		risus. Morbi rutrum consequat euismod. </li>
 -	</ul>
++<<<<<<< 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>
- 	</ul>
++
  
    <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>