From 7378a3a290a76cffecb2f45692f45d4e30b61ed9 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Tue, 2 Sep 2014 16:43:30 -0400
Subject: [PATCH] Fixing conflicts in header.

---
 2015/header.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/2015/header.html b/2015/header.html
index c99350c3..f46f1731 100755
--- a/2015/header.html
+++ b/2015/header.html
@@ -139,8 +139,6 @@
               </li>
 
               <li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>
-
-              <li><a href="http://media.libreplanet.org/">LibrePlanet 2013 videos</a></li>
               <li><a href="/2015/anti-harassment/">Anti-harassment policy</a></li>
               <li class="fsf-donate">
                 <a href="https://my.fsf.org/associate/support_freedom">
-- 
2.25.1