aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
Diffstat (limited to 'backend')
-rw-r--r--backend/api/api/appsettings.json15
1 files changed, 15 insertions, 0 deletions
diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json
index f8923a10..81255d5c 100644
--- a/backend/api/api/appsettings.json
+++ b/backend/api/api/appsettings.json
@@ -9,6 +9,20 @@
}
},
"AllowedHosts": "*",
+<<<<<<< HEAD
+ "UserStoreDatabaseSettings": {
+ //LocalHost
+
+ "ConnectionString": "mongodb://127.0.0.1:27017/",
+ "DatabaseName": "si_project",
+ "CollectionName": "users",
+ "DatasetCollectionName": "Dataset",
+ "ModelCollectionName": "Model",
+ "PredictorCollectionName": "Predictor",
+ "FilesCollectionName": "Files"
+
+ /*
+=======
"UserStoreDatabaseSettings": {
/* LocalHost
*/
@@ -21,6 +35,7 @@
"FilesCollectionName": "Files",
"ExperimentCollectionName": "Experiment"
/*
+>>>>>>> 499f641683767d2da735fb760c89f0c611e37596
"ConnectionString": "mongodb+srv://si_user:si_user@sidatabase.twtfm.mongodb.net/myFirstDatabase?retryWrites=true&w=majority",
"DatabaseName": "si_db",
"CollectionName": "users",