diff options
| author | Gubolin <gubolin@fantasymail.de> | 2014-12-07 11:54:58 +0100 |
|---|---|---|
| committer | Gubolin <gubolin@fantasymail.de> | 2014-12-07 11:54:58 +0100 |
| commit | 54d0194cd575724ff69526e707a02c5a0e3f2b73 (patch) | |
| tree | f6adf6913f449017590fe5770595c37b9ba25d0d /.gitignore | |
| parent | 4013e79a7421b9e6baacc8e34ae7a8ef188b38cb (diff) | |
| parent | 8338384bf572beb06ebd12a0c9af18029e99262a (diff) | |
| download | snap-issue_405.tar.gz snap-issue_405.zip | |
resolve merge conflictissue_405
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1 +1,2 @@ .DS_Store +*.swp |