Merge branch 'master' into adrm-ced

terraform · Mar 20, 2026 · 0a2783d · 0a2783d
2 parents 6df2c5f + 86ab665
commit 0a2783d
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/aws/info/ACCOUNTS.md b/aws/info/ACCOUNTS.md
@@ -367,13 +367,8 @@
 | 582222802695 | adsd-chris-nonprod-gov | ADSD CHRIS GovCloud NonProd | AWS GovCloud |
 | 413545130696 | adsd-chris-prod-ew | ADSD CHRIS EW Prod | AWS East/West | csvd.aws+adsd-chris-prod-ew@census.gov |
 | 582225653812 | adsd-chris-prod-gov | ADSD CHRIS GovCloud Prod | AWS GovCloud |
-<<<<<<< HEAD
 | 310567230128 | adrm-ced-dev-ew | ADRM CED EW Dev | AWS East/West | csvd.aws+adrm-ced-dev-ew@census.gov |
 | 591836001390 | adrm-ced-dev-gov | ADRM CED GovCloud dev | AWS GovCloud |
-=======
-|  | adrm-ced-dev-ew | ADRM CED EW Dev | AWS East/West | csvd.aws+adrm-ced-dev-ew@census.gov |
-|  | adrm-ced-dev-gov | ADRM CED GovCloud dev | AWS GovCloud |
->>>>>>> 3e68912629f31fffacce4dea424f042b0f583f2e
 
 # Decomissioned AWS Accounts
 
@@ -1014,10 +1009,7 @@
   * CRF # 647
   * Jira # CSVDIES-9321
   * creating account for adrm-ced-dev-{ew,gov}
-<<<<<<< HEAD
 * 2026-03-20
   * CRF # 647
   * Jira # CSVDIES-9321
   * Adding account numbers for adrm-ced-dev-{ew,gov}
-=======
->>>>>>> 3e68912629f31fffacce4dea424f042b0f583f2e