Merge branch 'main' into 4-make-buttonslinks-functional

osdc · May 11, 2024 · 84de1fd · 84de1fd
2 parents 8440830 + ff396ac
commit 84de1fd
Show file tree

Hide file tree

Showing 35 changed files with 1,159 additions and 84 deletions.
diff --git a/images/bottom left blob.png b/images/bottom left blob.png
diff --git a/images/bottom right blob.png b/images/bottom right blob.png
diff --git a/images/discord_5968759 1.png b/images/discord_5968759 1.png
diff --git a/images/facebook_1051309 1.png b/images/facebook_1051309 1.png
diff --git a/images/github_3488425 1.png b/images/github_3488425 1.png
diff --git a/images/left blob.png b/images/left blob.png
diff --git a/images/logo.png b/images/logo.png
diff --git a/images/osdc.png b/images/osdc.png
diff --git a/images/right blob lower.png b/images/right blob lower.png
diff --git a/images/right blob upper.png b/images/right blob upper.png
diff --git a/images/telegram_3536705 1.png b/images/telegram_3536705 1.png
diff --git a/images/twitter_5968830 1.png b/images/twitter_5968830 1.png
diff --git a/index.html b/index.html
@@ -1,16 +1,3 @@
-<<<<<<< HEAD
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-=======
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -108,6 +95,5 @@
     <div class="bottom-right-blob">
         <img src="./images/bottom right blob.png" alt="Bottom right Blob Image">
     </div>
->>>>>>> main
   </body>
 </html>