fix(authorCanViewReportsDetails): fix merge conflicts (7c140f05) · 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.

7c140f05

Commit 7c140f05 authored 6 years ago by

Tania Fecheta

Downloads
- Plain Diff

fix(authorCanViewReportsDetails): fix merge conflicts

parents 9dfde037 bbbdc0d8

No related branches found

No related tags found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-faraday-selectors/src/index.js 50 additions, 9 deletions

packages/component-faraday-selectors/src/index.js
packages/component-faraday-ui/src/PersonInvitation.js 24 additions, 0 deletions

packages/component-faraday-ui/src/PersonInvitation.js
packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js 16 additions, 3 deletions

...nent-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
packages/component-helper-service/src/services/Collection.js 6 additions, 4 deletions

packages/component-helper-service/src/services/Collection.js
packages/component-invite/src/CollectionsInvitations.js 1 addition, 1 deletion

packages/component-invite/src/CollectionsInvitations.js
packages/component-invite/src/routes/collectionsInvitations/delete.js 49 additions, 0 deletions

...ponent-invite/src/routes/collectionsInvitations/delete.js
packages/component-invite/src/tests/collectionsInvitations/delete.test.js 18 additions, 0 deletions

...nt-invite/src/tests/collectionsInvitations/delete.test.js
packages/component-manuscript/src/components/ManuscriptLayout.js 22 additions, 19 deletions

...s/component-manuscript/src/components/ManuscriptLayout.js
packages/component-manuscript/src/components/ManuscriptPage.js 5 additions, 1 deletion

...ges/component-manuscript/src/components/ManuscriptPage.js
packages/component-manuscript/src/redux/editors.js 2 additions, 1 deletion

packages/component-manuscript/src/redux/editors.js

with 193 additions and 38 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