diff options
| author | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:25:42 +0000 |
|---|---|---|
| committer | Radiohotline <radiohotline@disroot.org> | 2026-02-17 12:25:42 +0000 |
| commit | 910bf8e2868318dc89f560295d29d1fbac75dd35 (patch) | |
| tree | e763c7e01bbfca15a1fa0adb35abafb6598eb1ff /old/index.html | |
| parent | e6ecafcb6dc2ae42d28c820fa81c49110bab2b5a (diff) | |
| parent | 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 (diff) | |
Merge branch 'main' of github.com:radiohotline/softmachine.dev
Diffstat (limited to 'old/index.html')
| -rw-r--r-- | old/index.html | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/old/index.html b/old/index.html index 78ca9d8..e491e96 100644 --- a/old/index.html +++ b/old/index.html @@ -5,21 +5,13 @@ <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; @@ -38,26 +30,14 @@ 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> |