diff options
| author | radiohotline <radiohotline@disroot.org> | 2026-02-17 15:05:27 +0300 |
|---|---|---|
| committer | radiohotline <radiohotline@disroot.org> | 2026-02-17 15:05:27 +0300 |
| commit | 37522616a3efcaa3c7b40821155e8f1fff5c9985 (patch) | |
| tree | feb31bee8cc32fd7310559701e39719b2c6c096b /old/projects.html | |
| parent | 435aeb674198769b61b0ee8d82f85a108bacf49e (diff) | |
| parent | 60eb045c37c24677088f13cdded9408c292f65ff (diff) | |
maintainence
Diffstat (limited to 'old/projects.html')
| -rw-r--r-- | old/projects.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/old/projects.html b/old/projects.html index e748429..d93e658 100644 --- a/old/projects.html +++ b/old/projects.html @@ -63,7 +63,11 @@ <li>Troysort (joke)</li>
</ul>
- <img src="img/objects/duckgrass.gif"></img>
+<<<<<<< HEAD + <img src="../img/objects/duckgrass.gif"></img>
+======= + <img src="../img/objects/duckgrass.gif"></img>
+>>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </body>
</html>
|