diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-10-10 20:24:12 -0400 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-10-10 20:24:12 -0400 |
| commit | 7e542d78a703ccbe2de87627f5e8cbf8c70c1058 (patch) | |
| tree | bd58a0542dd0eabf9263f74e183101be27d7a124 /.gitignore | |
| parent | 062484b9bdfdc718106f157462eda798b233ecf4 (diff) | |
| parent | 4a6b5c5de2814e214d0bc73bc36e87008315f6ef (diff) | |
| download | ansible-7e542d78a703ccbe2de87627f5e8cbf8c70c1058.tar.gz | |
Merge remote branch 'stijnopheide/jinja-relative' into devel
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index dc7edbfe31..1845255860 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ rpm-build .DS_Store # manpage build results (not all checked in) docs/man/man3/* +# Sublime stuff +*.sublime-project +*.sublime-workspace |