summaryrefslogtreecommitdiff
path: root/old/house.css
diff options
context:
space:
mode:
authorradiohotline <radiohotline@disroot.org>2026-02-17 15:05:27 +0300
committerradiohotline <radiohotline@disroot.org>2026-02-17 15:05:27 +0300
commit37522616a3efcaa3c7b40821155e8f1fff5c9985 (patch)
treefeb31bee8cc32fd7310559701e39719b2c6c096b /old/house.css
parent435aeb674198769b61b0ee8d82f85a108bacf49e (diff)
parent60eb045c37c24677088f13cdded9408c292f65ff (diff)
maintainence
Diffstat (limited to 'old/house.css')
-rw-r--r--old/house.css10
1 files changed, 9 insertions, 1 deletions
diff --git a/old/house.css b/old/house.css
index f48fe86..8af0eb5 100644
--- a/old/house.css
+++ b/old/house.css
@@ -53,7 +53,11 @@ a:active {
overflow: scroll;
text-align: justify;
margin-right: 5px;
+<<<<<<< HEAD
margin-top: 5px;
+=======
+ margin-top: 20px;
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
padding: 0px;
}
@@ -77,4 +81,8 @@ a:active {
body {
margin: 20px;
-} \ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff