Fix gitignore

This commit is contained in:
Daniel Flanagan 2020-02-14 12:21:26 -06:00
parent 369984b0d5
commit bee9e1efe2
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4

27
.gitignore vendored
View file

@ -3,30 +3,8 @@
*.pid
*.tmp
*.secret
<<<<<<< HEAD
# TODO: should be unnecessary once color generation is homegrown
/colors/gen/vendor
/colors/gen/tmp
# keep the pipelines but hide their results
/bin/pipelines/*/*/*
# a place to keep secrets per-env
/env/*/.hidden
# ... and a place to keep shared secrets
/env/.hidden
||||||| 0d0e131
/.repositories
/.env/
=======
fishd.tmp.*
# TODO: should be unnecessary once color generation is homegrown
/colors/gen/vendor
/colors/gen/tmp
# keep the pipelines but hide their results
/bin/pipelines/*/*/*
@ -35,4 +13,7 @@ fishd.tmp.*
# ... and a place to keep shared secrets
/env/.hidden
>>>>>>> master
# TODO: should be unnecessary once color generation is homegrown
/colors/gen/vendor
/colors/gen/tmp