summaryrefslogtreecommitdiff
path: root/old/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'old/index.html')
-rw-r--r--old/index.html19
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>