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
app
assets
stylesheets
pages
merge_conflicts.scss
Find file
Blame
History
Permalink
Implement editor to manually resolve merge conflicts
· 26f658de
Alfredo Sumaran
authored
Sep 08, 2016
26f658de