fucked up git
This commit is contained in:
commit
d328a53a93
2 changed files with 8 additions and 0 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -1,4 +1,8 @@
|
|||
.DS_Store
|
||||
/bin
|
||||
interface.external.css
|
||||
<<<<<<< HEAD
|
||||
jquery.js
|
||||
=======
|
||||
jquery.css
|
||||
>>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue