LOL: Remove merge conflict marker

2024-12-22 04:40:09 +01:00 · 2012-12-04 11:23:00 -08:00 · 2012-12-04 11:23:00 -08:00 · 0e60fdd313
commit 0e60fdd313
parent 4158829a4e
1 changed files with 0 additions and 1 deletions
--- 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>