fixing merge conflicts

This commit is contained in:
lucasmbrown-usds 2022-09-30 13:43:31 -04:00
commit 07c4c030d3
266 changed files with 1868 additions and 1811 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

View file

@ -8,8 +8,8 @@ graph TB
C --> |No| A{Concerns Addressed?}
A --> |Yes| PR
A --> |No| IP["In Person Discussion"]
IP --> O{Voting Outcome}
IP --> O{Voting Outcome}
O --> |Accepted - add label | PR
O --> |Rejected - add label | PR
PR --> PRP["Standard PR Process"]
PRP --> Close
PRP --> Close