Merge branch 'master' of https://github.com/jortilles/EDA

# Conflicts: # .gitignore
jortilles · May 20, 2024 · fb190c2 · fb190c2
2 parents 73e66d1 + 75b2c4a
commit fb190c2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,3 +43,17 @@ eda/sda_api/src/config/seed.js
 eda/sda_api/src/views/postform.html
 eda/sda_api/package-lock.json
 
+eda/eda_api/config/SCRM
+eda/eda_api/config
+eda/eda_app/src/app/config
+eda/eda_app/config/*
+eda/eda_api/config/database.config.js
+eda/eda_api/config/oracle-config.js
+eda/eda_api/config/seed.js
+eda/eda_api/config/SMPT.config.json
+eda/eda_app/src/app/config/config.ts
+eda/eda_api/config/database.config.js
+eda/eda_api/config/oracle-config.js
+eda/eda_api/config/seed.js
+eda/eda_api/config/SMPT.config.json
+eda/eda_app/src/app/config/config.ts
diff --git a/eda/eda_api/config/SMPT.config.json b/eda/eda_api/config/SMPT.config.json
diff --git a/eda/eda_api/config/database.config.js b/eda/eda_api/config/database.config.js
diff --git a/eda/eda_api/config/oracle-config.js b/eda/eda_api/config/oracle-config.js
diff --git a/eda/eda_api/config/seed.js b/eda/eda_api/config/seed.js
diff --git a/eda/eda_app/src/app/config/config.ts b/eda/eda_app/src/app/config/config.ts