aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorRuben Knol <c.minor6@gmail.com>2020-09-27 16:10:11 +0000
committerRuben Knol <c.minor6@gmail.com>2020-09-27 16:10:11 +0000
commita69b770cb379354226a8c05be5cbea3e8703803f (patch)
treec1680258245610509b619ffde21777120f94481a /.gitignore
parent98342562bd88eccdb4eaeecacf866996b64ce974 (diff)
parentac259c8645783dcb92fc0eafff166769f5216aa9 (diff)
Merge branch 'server' into 'main'
First implementation of the socket server See merge request rbdr/junction!2
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 0ac92e1..9765d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
.idea
-.DS_Store
node_modules
+.DS_Store