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/src/app/app.component.html | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html

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

diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html b/sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html
new file mode 100755
index 00000000..39dcd1dd
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/app.component.html
@@ -0,0 +1,6 @@
+
+<div>
+  <h1>Dobrodošli u prvi online info servis laptopova</h1>
+  <app-navbar></app-navbar>
+</div>
+<router-outlet></router-outlet>
-- 
cgit v1.2.3