Merge branch 'master' into master

2018-10-29 17:11:28 -04:00 · 2018-10-29 17:11:28 -04:00 · c8b0594740
commit c8b0594740
parent ca5d8155c4 52a9d346f6
7 changed files with 1 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,8 +5,7 @@ pkg/
 *.swp
 *~
 .vscode/
-.vs/slnx.sqlite
-.vs/microservices-demo/v15/.suo
+.vs/
 .idea
 .skaffold-*.yaml
 .kubernetes-manifests-*/
--- a/src/cartservice/.vs/cartservice/DesignTimeBuild/.dtbcache
+++ b/src/cartservice/.vs/cartservice/DesignTimeBuild/.dtbcache
--- a/src/cartservice/.vs/cartservice/v15/.suo
+++ b/src/cartservice/.vs/cartservice/v15/.suo
--- a/src/cartservice/.vs/cartservice/v15/Server/sqlite3/db.lock
+++ b/src/cartservice/.vs/cartservice/v15/Server/sqlite3/db.lock
--- a/src/cartservice/.vs/cartservice/v15/Server/sqlite3/storage.ide
+++ b/src/cartservice/.vs/cartservice/v15/Server/sqlite3/storage.ide
--- a/src/cartservice/.vs/cartservice/v15/Server/sqlite3/storage.ide-shm
+++ b/src/cartservice/.vs/cartservice/v15/Server/sqlite3/storage.ide-shm
--- a/src/cartservice/.vs/cartservice/v15/Server/sqlite3/storage.ide-wal
+++ b/src/cartservice/.vs/cartservice/v15/Server/sqlite3/storage.ide-wal