Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

dashboard
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

63b0cb2f

Commit 63b0cb2f authored 5 years ago by jackie / Andrea Ida Malkah Klaura

Downloads
- Patches
- Plain Diff

FEAT: implements all conflict resolution modes

parent 4682abaf

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/components/EmissionManager.vue 43 additions, 4 deletions

src/components/EmissionManager.vue
src/components/EmissionManagerModalCreate.vue 1 addition, 0 deletions

src/components/EmissionManagerModalCreate.vue
src/components/EmissionManagerModalResolve.vue 12 additions, 6 deletions

src/components/EmissionManagerModalResolve.vue

with 56 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment