From: Molly de Blanc <molly@fsf.org>
Date: Tue, 29 Aug 2017 15:15:57 +0000 (-0400)
Subject: messing around with git. woo.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fb97a7dc5c573c8301bfe202b80e2c913d417bd9;p=libreplanet-static.git

messing around with git. woo.
---

fb97a7dc5c573c8301bfe202b80e2c913d417bd9
diff --cc 2018/index.html
index 407230e5,50e3d327..6c90b2b8
--- a/2018/index.html
+++ b/2018/index.html
@@@ -14,11 -14,11 +14,19 @@@
  		<li class="item active">
  			<img src="http://static.fsf.org/nosvn/libreplanet/2018/assets/banner_no_year.svg"
  			alt="[ Libreplanet logo, consisting of several stars and connected green planets and the text "LibrePlanet" ]">
++<<<<<<< HEAD
 +			<p class="carousel-caption-bottom" style="background-color: white;"><br></p>
 +			</li>
 +				<li class="item">
 +				<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 +				alt="[ Hackers at the GNU 30th anniversary hackathon ]">
++=======
+ 		</li>
+ 			
+ 		<li class="item">
+ 				<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+ 				alt="[ A photo of people in a room on laptops. They are sitting at desks, with a clean blackboard in the background on one wall, and on the other written on a bloackboard is the text "Installation Feedback." Several of the people have long hair, and one woman's hair is pink and yellow. ]">
++>>>>>>> master
  				<p class="carousel-caption-bottom"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
  			</p>
  		</li>