diff options
| author | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:12:37 +0000 |
|---|---|---|
| committer | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:12:37 +0000 |
| commit | 223ef7acb24356fca6cf5ab40c02b43a09452093 (patch) | |
| tree | d845297a50e78f9ca9c37c113b78b8a2aaa1c138 /old/index.html | |
| parent | cae6b00e0f3352a323af2400bf7f9deb7460c7de (diff) | |
| parent | 37522616a3efcaa3c7b40821155e8f1fff5c9985 (diff) | |
about
Diffstat (limited to 'old/index.html')
| -rw-r--r-- | old/index.html | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/old/index.html b/old/index.html index 2d70bd8..78ca9d8 100644 --- a/old/index.html +++ b/old/index.html @@ -5,13 +5,21 @@ <meta name="description" content="The Weight of Comfort"> <meta name="keywords" content="Personal, Music, Poetry, Art, Radiohotline, Teethinvitro"> <meta name="author" content="Radiohotline"> +<<<<<<< HEAD + <meta http-equiv="refresh" content="0; url=https://softmachine.dev/" /> +======= +>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff <style> html { min-height: 100%; box-shadow: inset 0 0 300px #000, inset 0 0 120px #000, inset 0 0 80px #000; } body { +<<<<<<< HEAD + background-image: url(img/bg/insert.png); +======= background-image: url(../img/bg/insert.png); +>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff background-repeat: no-repeat; background-attachment: fixed; background-size: cover; @@ -30,15 +38,26 @@ 1px 1px #dbcdbe, -1px -1px #dbcdbe, 1px -1px #dbcdbe, -1px 1px #dbcdbe; } </style> +<<<<<<< HEAD +======= <link href="crt index.css" rel="stylesheet"> +>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff <title>Soft Machine</title> </head> <body> <br> +<<<<<<< HEAD + <p style="z-index: 1;">moved</p> + + <p style="color:grey; font-size: 14px;">Updated: 2026-02-16 20:36:22</p> + + <a href="https://softmachine.dev">>> redirect</a> +======= <p style="z-index: 1;">soft machine</p> <!-- <p style="color:grey; position: absolute; left: 30%; top: 19%; z-index: -1;">lorem ipsum dolor sit amet</p> --> <a href="house.html">>> proceed</a> +>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </body> </html> |
