diff options
| author | Adam Jacob <adam@hjksolutions.com> | 2009-02-22 19:40:25 -0800 |
|---|---|---|
| committer | Adam Jacob <adam@hjksolutions.com> | 2009-02-22 19:40:25 -0800 |
| commit | 12a07314216d6208f5062fad72f76de68305bee3 (patch) | |
| tree | d94a70d95ffa2205b6a8d4b803e3258c0ffea93a /.gitignore | |
| parent | d529d7ef8db37b33ecae9fc564ae9da47fd17661 (diff) | |
| parent | c696e4cc193636ad0fa77fb7f2765ce5011f4418 (diff) | |
| download | chef-12a07314216d6208f5062fad72f76de68305bee3.tar.gz | |
Merge branch 'master' into seancribbs/CHEF-102
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 98d5c33e2e..86a1f94724 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ chef/pkg chef-server/pkg chef/log chef-server/log +features/data/tmp/** *.swp |