diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-06-03 12:17:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-06-03 12:17:56 -0400 |
| commit | 5d3408d32292402ccd69bfadb3c28937a96eda5d (patch) | |
| tree | 24c10a1a53d0e85f4699bc18e377764598c0536d /.gitignore | |
| parent | ce0e1a6dc82acb7fd8e64a9ec4c6ff0acf87e241 (diff) | |
| parent | fd9d172bcd9f217b67a60ed2e694bad4f6602d32 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -7,4 +7,7 @@ Setup Setup.hi Setup.o docker +chroot propellor.1 +.lock +.lastchecked |