Skip to content

Commit

Permalink
Merge branch 'develop' into release/2.5.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	pyproject.toml
  • Loading branch information
jamesfwood committed Jul 19, 2023
2 parents 666cdff + 9a292f9 commit 48d7523
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions cmr/ops_associations.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,9 @@ C2274919541-POCLOUD
C2296989383-POCLOUD
C2296989388-POCLOUD
C2296989390-POCLOUD
C2601585875-POCLOUD
C2628593693-POCLOUD
C2601584109-POCLOUD
C2601583089-POCLOUD
C2601581863-POCLOUD
C2628598397-POCLOUD
1 change: 1 addition & 0 deletions cmr/uat_associations.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ C1256507988-POCLOUD
C1256507990-POCLOUD
C1256122852-POCLOUD
C1256507989-POCLOUD
C1238621112-POCLOUD

0 comments on commit 48d7523

Please sign in to comment.