Fixing conflicts

This commit is contained in:
Darren 'Tadgy' Austin 2017-10-19 13:51:14 +01:00
commit c3c6c7850a
3 changed files with 12 additions and 9 deletions

3
.gitignore vendored
View file

@ -1,2 +1,5 @@
*~
*.save
NOTES
.ssh/id_rsa
.ssh/id_ed25519