Fix merge conflict on /developers/tools

solid · Jun 21, 2024 · bc285fe · bc285fe
1 parent fd4ee79
commit bc285fe
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/developers/tools/index.html b/developers/tools/index.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!doctype html>
 <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -628,16 +627,4 @@ <h2 id="how-to-contribute"><a name="contribute">How to contribute</a></h2>
 </footer>
 
   </body>
-
-
-=======
-<!DOCTYPE html>
-<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta charset="utf-8" />
-  <title>Redirecting...</title>
-  <meta http-equiv="refresh" content="0; url=https://solidproject.org/for-developers.html" />
-</head>
-<body>Redirecting...</body>
->>>>>>> 99dd100 (Added stubs to ensure old URIs for old website)
 </html>