From dce4e644d5e5d9c97ff5ac337448b52f2a2a64fd Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Wed, 2 Mar 2022 23:38:27 +0100
Subject: Merge branch 'dev' of
 http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara

# Conflicts:
#	.gitignore
---
 sandbox/TestIvanLjubisavljevic/frontend/.gitignore | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100755 sandbox/TestIvanLjubisavljevic/frontend/.gitignore

(limited to 'sandbox/TestIvanLjubisavljevic/frontend/.gitignore')

diff --git a/sandbox/TestIvanLjubisavljevic/frontend/.gitignore b/sandbox/TestIvanLjubisavljevic/frontend/.gitignore
new file mode 100755
index 00000000..105c00f2
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/.gitignore
@@ -0,0 +1,46 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.angular/cache
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
-- 
cgit v1.2.3