update docker and ci files

This commit is contained in:
Tim Schubert 2022-05-22 22:15:10 +02:00
parent a9d1d2ab20
commit 3cb385044d
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
5 changed files with 5 additions and 15 deletions

15
.gitignore vendored
View file

@ -1,16 +1,5 @@
*.swp
.direnv
<<<<<<< HEAD
<<<<<<< HEAD
||||||| parent of 2ccfcd1 (fixup flake)
testgit
*.swp
=======
testgit
*.swp
pad-archiver
result
>>>>>>> 2ccfcd1 (fixup flake)
||||||| parent of 056d53e (port to go)
=======
testgit
*.swp
>>>>>>> 056d53e (port to go)