fix conflict

This commit is contained in:
rob 2022-08-28 13:48:59 +10:00
parent 7ae5f4e42a
commit da3c8d46ba
1 changed files with 1 additions and 2 deletions

3
.gitignore vendored
View File

@ -1,5 +1,4 @@
nexus nexus
*.o *.o
*.swp *.swp
*.txt log.txt