fucked up git

This commit is contained in:
buzz-lightsnack-2007 2024-03-19 09:47:10 +08:00
commit d328a53a93
2 changed files with 8 additions and 0 deletions

4
.gitignore vendored
View file

@ -1,4 +1,8 @@
.DS_Store
/bin
interface.external.css
<<<<<<< HEAD
jquery.js
=======
jquery.css
>>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e