Fixing conflicts
This commit is contained in:
parent
ec89482ea8
commit
c3c6c7850a
3 changed files with 12 additions and 9 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -1,2 +1,5 @@
|
|||
*~
|
||||
*.save
|
||||
NOTES
|
||||
.ssh/id_rsa
|
||||
.ssh/id_ed25519
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue