aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Foiani <sotech117@michaels-mbp-5.devices.brown.edu>2022-08-10 13:45:19 -0400
committerMichael Foiani <sotech117@michaels-mbp-5.devices.brown.edu>2022-08-10 13:45:19 -0400
commitf573b7a8e0764f6fdfec637810f6e5b699c33053 (patch)
tree3a66fa34db31e83c95cc72cf13515f6c018b3a88 /.gitignore
parent57a2713e1219b58e7ad08b697a23ea3f9b962a84 (diff)
parenta63f017c213563728f45f2caa7415843f50f3559 (diff)
Merge branch 'master' into report-bug-mfoiani
casual merge with master to keep local branch updated
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7a3c82ee6..7d3a4d214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ src/server/session_manager/logs/**/*.log
debug.log
.vscodeignore
Dockerfile
+.vscode/launch.json