diff options
| author | Daniel DeLeo <dan@opscode.com> | 2010-05-06 20:32:48 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2010-05-06 20:32:48 -0700 |
| commit | 5be5714222f092e34044254680a1138b63b9002c (patch) | |
| tree | 496989589dc3d88fb15712480c55ebe7b9aabd1e /.gitignore | |
| parent | 8da589022f53c757ea3f3a7ac66224644d617a99 (diff) | |
| parent | 13c2cea6a753b4b132cf48545d9e0bf007066151 (diff) | |
| download | chef-5be5714222f092e34044254680a1138b63b9002c.tar.gz | |
Merge branch 'master' into 0.9-alpha
Conflicts:
chef/lib/chef/client.rb
chef/lib/chef/node.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7c2dc3213a..5d7ba78c01 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ features/data/cookbooks/**/metadata.json features/data/solr/** erl_crash.dump *.rake_tasks~ +.idea
\ No newline at end of file |