diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 16:40:39 +0200 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 16:40:39 +0200 |
| commit | 0a67c96df794af07d685449feaa5a75ebd58520b (patch) | |
| tree | 29172caac555fc3153d6c9d07bae60ad5f94c8a5 /.gitignore | |
| parent | 52e468df820115b77f90d404cf6ec8b5678342d7 (diff) | |
| parent | 2744d0df0e842f891931f6ab59d58f50445378b8 (diff) | |
resolved merge conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -3,4 +3,3 @@ api_key.rb tmp/* log/* datasets/* -public/* |