Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Projects
Groups
Snippets
Sign up now
Login
Sign in / Register
Toggle navigation
Menu
Open sidebar
AURA
dashboard
Repository
42850e78d9db0ab36077c765ecbc76cb3c1cbd8a
Switch branch/tag
dashboard
src
components
EmissionManager.vue
Find file
Blame
History
Permalink
FIX
#29
for ours-* conflict resolution modes
· 42850e78
jackie / Andrea Ida Malkah Klaura
authored
Oct 24, 2019
42850e78
jackie / Andrea Ida Malkah Klaura authored42850e78