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/projects.html | |
| parent | e6ecafcb6dc2ae42d28c820fa81c49110bab2b5a (diff) | |
| parent | 5024f0d9fcc8426c7c48a7ce0b4cc86485921bd8 (diff) | |
Merge branch 'main' of github.com:radiohotline/softmachine.dev
Diffstat (limited to 'old/projects.html')
| -rw-r--r-- | old/projects.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/old/projects.html b/old/projects.html index d93e658..9a42db0 100644 --- a/old/projects.html +++ b/old/projects.html @@ -63,11 +63,7 @@ <li>Troysort (joke)</li>
</ul>
-<<<<<<< HEAD <img src="../img/objects/duckgrass.gif"></img>
-======= - <img src="../img/objects/duckgrass.gif"></img>
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff </body>
</html>
|