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/TestAppOgnjen/FrontEnd/.vscode/extensions.json | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json

(limited to 'sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json')

diff --git a/sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json b/sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json
new file mode 100644
index 00000000..77b37457
--- /dev/null
+++ b/sandbox/TestAppOgnjen/FrontEnd/.vscode/extensions.json
@@ -0,0 +1,4 @@
+{
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
+  "recommendations": ["angular.ng-template"]
+}
-- 
cgit v1.2.3