Commit 8c455270 authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in changelogs/unreleased/39880-merge-method-api.yml

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 8cc7570f
--- ---
title: 'API: Add parameter merge_method to projects' title: 'API: Add parameter merge_method to projects'
<<<<<<< HEAD
merge_request:
=======
merge_request: 18031 merge_request: 18031
>>>>>>> upstream/master
author: Jan Beckmann author: Jan Beckmann
type: added type: added
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment