merge in latest and fix conflicts

transcom · Jan 22, 2025 · c340cf3 · c340cf3
2 parents f2502ad + 3c210f3
commit c340cf3
Show file tree

Hide file tree

Showing 182 changed files with 5,459 additions and 4,531 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,10 +40,10 @@ references:
 
   # In addition, it's common practice to disable acceptance tests and
   # ignore tests for dp3 deploys. See the branch settings below.
-  dp3-branch: &dp3-branch integrationTesting
+  dp3-branch: &dp3-branch placeholder_branch_name
   # MUST BE ONE OF: loadtest, demo, exp.
   # These are used to pull in env vars so the spelling matters!
-  dp3-env: &dp3-env loadtest
+  dp3-env: &dp3-env placeholder_env
 
   # set integration-ignore-branch to the branch if you want to IGNORE
   # integration tests, or `placeholder_branch_name` if you do want to