From 0e60fdd31358c1dd8a86c9d9f95226cc67497ea7 Mon Sep 17 00:00:00 2001
From: Phil Haack <haacked@gmail.com>
Date: Tue, 4 Dec 2012 11:23:00 -0800
Subject: [PATCH] LOL: Remove merge conflict marker

---
 licenses/permissive/bsd-3-clause/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/licenses/permissive/bsd-3-clause/index.html b/licenses/permissive/bsd-3-clause/index.html
index 868e6ab..5234284 100644
--- a/licenses/permissive/bsd-3-clause/index.html
+++ b/licenses/permissive/bsd-3-clause/index.html
@@ -59,7 +59,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
           Creative Commons Attribution 3.0 Unported License</a>.
         </p>
       </div>
->>>>>>> Convert licenses to plain text
     </div>
   </body>
 </html>