Skip to content

Fix faulty conflict resolution #7527

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

Closed
wants to merge 1 commit into from
Closed

Fix faulty conflict resolution #7527

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
2 changes: 1 addition & 1 deletion contributing/code/core_team.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Active Core Members
* **Christophe Coevoet** (`stof`_) can merge into all components, bridges and
bundles;

* **Kévin Dunglas** (`dunglas`_) can merge into the Serializer_
* **Kévin Dunglas** (`dunglas`_) can merge into the PropertyInfo_ and the Serializer_
component;

* **Abdellatif AitBoudad** (`aitboudad`_) can merge into the Translation_
Expand Down