Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

670c48fb

Commit 670c48fb authored 5 years ago by jackie / Andrea Ida Malkah Klaura

Downloads
- Patches
- Plain Diff

FEAT: add conflict resolve modal

parent e2d23fb2

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/components/EmissionManager.vue 101 additions, 17 deletions

src/components/EmissionManager.vue
src/components/EmissionManagerModalCreate.vue 2 additions, 16 deletions

src/components/EmissionManagerModalCreate.vue
src/components/EmissionManagerModalResolve.vue 174 additions, 0 deletions

src/components/EmissionManagerModalResolve.vue
src/mixins/rrules.js 27 additions, 0 deletions

src/mixins/rrules.js

with 304 additions and 33 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