diff options
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>
|