fix(mergeConflicts): (19f49337) · Commits · xpub / xpub-faraday · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xpub-faraday
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Container Registry
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

19f49337

Commit 19f49337 authored 6 years ago by

Tania Fecheta

Downloads
- Plain Diff

fix(mergeConflicts):

parents e1bc3771 c2c18d86

No related branches found

No related tags found

2 merge requests!110Sprint 21 Features,!93Hin 1013

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-faraday-selectors/src/index.js 1 addition, 0 deletions

packages/component-faraday-selectors/src/index.js
packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js 68 additions, 22 deletions

...faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js
packages/component-faraday-ui/src/modals/MultiAction.js 5 additions, 1 deletion

packages/component-faraday-ui/src/modals/MultiAction.js
packages/component-manuscript-manager/src/routes/fragmentsRecommendations/notifications/notifications.js 5 additions, 2 deletions

...s/fragmentsRecommendations/notifications/notifications.js
packages/component-manuscript-manager/src/routes/technicalChecks/notifications/notifications.js 9 additions, 153 deletions

...src/routes/technicalChecks/notifications/notifications.js
packages/component-manuscript-manager/src/routes/technicalChecks/patch.js 35 additions, 11 deletions

...nt-manuscript-manager/src/routes/technicalChecks/patch.js
packages/component-manuscript/src/components/EditorialCommentCard.js 16 additions, 2 deletions

...mponent-manuscript/src/components/EditorialCommentCard.js
packages/component-manuscript/src/components/ManuscriptLayout.js 7 additions, 13 deletions

...s/component-manuscript/src/components/ManuscriptLayout.js
packages/component-manuscript/src/components/ManuscriptPage.js 10 additions, 0 deletions

...ges/component-manuscript/src/components/ManuscriptPage.js
packages/components-faraday/src/components/MakeDecision/DecisionForm.js 1 addition, 1 deletion

...nents-faraday/src/components/MakeDecision/DecisionForm.js

with 157 additions and 205 deletions

0% 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