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/testAppSonja/frontend/front/src/app/app.component.html | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 sandbox/testAppSonja/frontend/front/src/app/app.component.html

(limited to 'sandbox/testAppSonja/frontend/front/src/app/app.component.html')

diff --git a/sandbox/testAppSonja/frontend/front/src/app/app.component.html b/sandbox/testAppSonja/frontend/front/src/app/app.component.html
new file mode 100644
index 00000000..cd1aafc8
--- /dev/null
+++ b/sandbox/testAppSonja/frontend/front/src/app/app.component.html
@@ -0,0 +1,2 @@
+<router-outlet>
+</router-outlet>
\ No newline at end of file
-- 
cgit v1.2.3