aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorTAMARA JERINIC <tamara.jerinic@gmail.com>2022-05-19 17:21:04 +0200
committerTAMARA JERINIC <tamara.jerinic@gmail.com>2022-05-19 17:21:04 +0200
commit03b26d14c16a4551a48fe0d3f5993bec84fa36b1 (patch)
tree92382c46f75f5d54d763ca0674ed7f5095c703fe /backend
parentdce16507a0e8219f1bb04a2ec9a0afad521fac47 (diff)
parent529394dd526811e059dfb5f8f76597ffd90b2fea (diff)
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts: # backend/api/api/appsettings.json
Diffstat (limited to 'backend')
-rw-r--r--backend/api/api/appsettings.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json
index 77708086..b502efeb 100644
--- a/backend/api/api/appsettings.json
+++ b/backend/api/api/appsettings.json
@@ -27,6 +27,9 @@
/*
"ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority",
+
+ "ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority",
+ 529394dd526811e059dfb5f8f76597ffd90b2fea
"DatabaseName": "si_db",
"CollectionName": "users",
"DatasetCollectionName": "Dataset",