fix: resolve footer conflict

ubiquity · Jul 17, 2024 · f6b7278 · f6b7278
1 parent 7291d13
commit f6b7278
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/static/index.html b/static/index.html
@@ -173,7 +173,6 @@
           <tbody id="additionalDetailsTable"></tbody>
         </table>
       </div>
-<<<<<<< HEAD
       <figure id="carousel">
         <div id="prevTx"></div>
         <div id="rewardsCount"></div>
@@ -189,15 +188,6 @@ <h2>Disclaimer</h2>
         </div>
       </div>
       <footer>
-        <div id="build">
-          <a target="_blank" rel="noopener noreferrer"></a>
-=======
-      <footer
-        ><figure id="carousel">
-          <div id="prevTx"></div>
-          <div id="rewardsCount"></div>
-          <div id="nextTx"></div>
-        </figure>
         <div class="footer">
           <div id="build">
             <a target="_blank" rel="noopener noreferrer"></a>
@@ -211,7 +201,6 @@ <h2>Disclaimer</h2>
               </svg>
             </div>
           </a>
->>>>>>> development
         </div>
       </footer>
     </main>