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
---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 2ab32596..88e4dc7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
+sandbox/test-projekat-danijel/backend/backend/bin/
+sandbox/test-projekat-danijel/backend/backend/obj/
+sandbox/test-projekat-danijel/backend/.vs/
+sandbox/testAppSonja/MiniApkSonja/MiniApkSonja/bin/
+sandbox/testAppSonja/MiniApkSonja/MiniApkSonja/obj/
+sandbox/TestTamara/TestTamara/TestTamara/obj/
 sandbox/TestTamara/TestTamara/TestTamara/bin/
+
-- 
cgit v1.2.3