Merge remote branch 'upstream/master'
* upstream/master: These should go into other gitignores, like Vim.gitignore Added Wordpress (Forgot to 'git add .') Added Vim >= 7.3 persistent undo files Added few files to OSX.gitignore Conflicts: Global/OSX.gitignore
This commit is contained in:
@@ -1 +1,2 @@
|
||||
.*.sw[a-z]
|
||||
*.un~
|
||||
|
Reference in New Issue
Block a user