diff options
Diffstat (limited to 'backend/api')
| -rw-r--r-- | backend/api/api/appsettings.json | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/backend/api/api/appsettings.json b/backend/api/api/appsettings.json index 81255d5c..f8923a10 100644 --- a/backend/api/api/appsettings.json +++ b/backend/api/api/appsettings.json @@ -9,20 +9,6 @@ } }, "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 */ @@ -35,7 +21,6 @@ "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", |