From dce4e644d5e5d9c97ff5ac337448b52f2a2a64fd Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC 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 --- .../Back/.vs/Back/DesignTimeBuild/.dtbcache.v2 | Bin 0 -> 227 bytes sandbox/testAppNevena/Back/.vs/Back/v16/.suo | Bin 0 -> 27648 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 sandbox/testAppNevena/Back/.vs/Back/DesignTimeBuild/.dtbcache.v2 create mode 100644 sandbox/testAppNevena/Back/.vs/Back/v16/.suo (limited to 'sandbox/testAppNevena/Back/.vs') diff --git a/sandbox/testAppNevena/Back/.vs/Back/DesignTimeBuild/.dtbcache.v2 b/sandbox/testAppNevena/Back/.vs/Back/DesignTimeBuild/.dtbcache.v2 new file mode 100644 index 00000000..dede50b4 Binary files /dev/null and b/sandbox/testAppNevena/Back/.vs/Back/DesignTimeBuild/.dtbcache.v2 differ diff --git a/sandbox/testAppNevena/Back/.vs/Back/v16/.suo b/sandbox/testAppNevena/Back/.vs/Back/v16/.suo new file mode 100644 index 00000000..e204565c Binary files /dev/null and b/sandbox/testAppNevena/Back/.vs/Back/v16/.suo differ -- cgit v1.2.3