Merge branch 'master' of https://github.com/aykhan019/media.aykhan.net

aykhan019 · Aug 31, 2024 · ca1886e · ca1886e
2 parents 86c329f + f5b8e8d
commit ca1886e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -31,7 +31,11 @@ <h1 class="text-center my-4">Media Gallery</h1>
       <div id="loading-spinner" class="spinner">
         <div class="spinner-border" role="status"></div>
       </div>
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> f5b8e8d7dbdc214bca59c73c9bd85980c53765f8
       <!-- Accordion starts here -->
       <div class="accordion mt-4" id="folderAccordion">
         <!-- Accordion items will be dynamically generated here -->