diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-28 21:33:41 +0300 |
| commit | cb1e4a8abb33a32da9bec300e0259d50fa2afea9 (patch) | |
| tree | c4fdd4076025bb5b612bc88debab62709c311e5f /vendor/gitignore/Unity.gitignore | |
| parent | 2a6e33d838caa813e248de6af603201f5addb7eb (diff) | |
| parent | d5734de3d60983fcb3d3f3099d47fe9831e453ad (diff) | |
Merge branch 'master' into 'remove-dropzonejs-rails'
# Conflicts:
# Gemfile.lock
Diffstat (limited to 'vendor/gitignore/Unity.gitignore')
| -rw-r--r-- | vendor/gitignore/Unity.gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/gitignore/Unity.gitignore b/vendor/gitignore/Unity.gitignore index 75e5b1405da..0210746b1a5 100644 --- a/vendor/gitignore/Unity.gitignore +++ b/vendor/gitignore/Unity.gitignore @@ -5,8 +5,8 @@ [Bb]uilds/ Assets/AssetStoreTools* -# Visual Studio 2015 cache directory -/.vs/ +# Visual Studio cache directory +.vs/ # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ @@ -22,6 +22,7 @@ ExportedObj/ *.booproj *.svd *.pdb +*.opendb # Unity3D generated meta files *.pidb.meta |