fix conflict
This commit is contained in:
parent
7ae5f4e42a
commit
da3c8d46ba
|
@ -1,5 +1,4 @@
|
|||
nexus
|
||||
*.o
|
||||
*.swp
|
||||
*.txt
|
||||
|
||||
log.txt
|
||||
|
|
Loading…
Reference in New Issue