mirror of
https://github.com/DOI-DO/j40-cejst-2.git
synced 2025-10-02 13:53:18 -07:00
fixing merge conflicts
This commit is contained in:
parent
3b150b5761
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 |
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue