content.html

Bapt-Tech · Oct 16, 2024 · 8eab5d2 · 8eab5d2
1 parent 972c43d
commit 8eab5d2
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/content.html b/content.html
@@ -5,21 +5,6 @@
         <title>TerraMine - Content</title>
         <link rel="icon" type="image/x-icon" href="images/terramine.ico">
     </head>
-<<<<<<< HEAD
-
-    <body>
-        <h1>
-            Content
-        </h1>
-        <section id="info" class="content-mods">
-            <h1>Mods</h1>
-            <p>Mods</p>  
-        </section>
-        <section id="info" class="content-pictures">
-
-        </section>
-    </body>
-=======
 
     <body>
         <h1>