Skip to content

Update ConflictResolutionPolicy.mdx #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QuintinCoetzee-CapeTown wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update ConflictResolutionPolicy.mdx #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/Policies/ConflictResolutionPolicy.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ sidebar_label: "Conflict resolution policy"
import MaintainerTag from "@site/src/components/MaintainerTag";
import ControlledDocBanner from "@site/src/components/ControlledDocBanner";

<MaintainerTag maintainerEmails={["quintin.coetzee@openenergytransition.org", "max.parzen@openenergytransition.org"]} />
<MaintainerTag maintainerEmails={["quintin.coetzee@openenergytransition.org", "jodie.barnard@openenergytransition.org"]} />

# Conflict resolution policy
# Conflict Resolution Policy

<ControlledDocBanner />

Expand Down
Loading