Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Sign in
Toggle navigation
Menu
projects.thm.de
GitLab FOSS
Repository
gitlab
spec
features
merge_request
user_resolves_conflicts_spec.rb
Find file
Blame
History
Permalink
Re-enables merge conflicts resolution spec
· ea1f3882
Phil Hughes
authored
Sep 10, 2018
https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
ea1f3882