fix(manuscriptLayout): fix merge conflicts (dae96401) · Commits · xpub / xpub-faraday

Commit dae96401 authored 6 years ago by

Alexandru Munteanu

Browse files

fix(manuscriptLayout): fix merge conflicts

parents 1bfd8409 30968ee0

No related branches found

No related tags found

2 merge requests!136Sprint 22 features (updates),!133HIN-1063

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-faraday-selectors/src/index.js 3 additions, 0 deletions

packages/component-faraday-selectors/src/index.js
packages/component-faraday-ui/src/AuthorReply.js 53 additions, 0 deletions

packages/component-faraday-ui/src/AuthorReply.js
packages/component-faraday-ui/src/AuthorReply.md 77 additions, 0 deletions

packages/component-faraday-ui/src/AuthorReply.md
packages/component-faraday-ui/src/ReviewerReportAuthor.js 32 additions, 20 deletions

packages/component-faraday-ui/src/ReviewerReportAuthor.js
packages/component-faraday-ui/src/Tag.js 5 additions, 4 deletions

packages/component-faraday-ui/src/Tag.js
packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js 12 additions, 3 deletions

...component-faraday-ui/src/contextualBoxes/AuthorReviews.js
packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js 21 additions, 0 deletions

...raday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.md 75 additions, 0 deletions

...raday-ui/src/contextualBoxes/ResponseToRevisionRequest.md
packages/component-faraday-ui/src/contextualBoxes/index.js 3 additions, 0 deletions

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

packages/component-faraday-ui/src/index.js
packages/component-fixture-manager/src/fixtures/collectionIDs.js 1 addition, 0 deletions

...s/component-fixture-manager/src/fixtures/collectionIDs.js
packages/component-fixture-manager/src/fixtures/collections.js 34 additions, 0 deletions

...ges/component-fixture-manager/src/fixtures/collections.js
packages/component-fixture-manager/src/fixtures/fragments.js 14 additions, 1 deletion

packages/component-fixture-manager/src/fixtures/fragments.js
packages/component-fixture-manager/src/fixtures/teams.js 4 additions, 0 deletions

packages/component-fixture-manager/src/fixtures/teams.js
packages/component-manuscript-manager/src/routes/collections/delete.js 11 additions, 4 deletions

...onent-manuscript-manager/src/routes/collections/delete.js
packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js 10 additions, 1 deletion

...cript-manager/src/routes/fragmentsRecommendations/post.js
packages/component-manuscript-manager/src/tests/collections/delete.test.js 65 additions, 0 deletions

...t-manuscript-manager/src/tests/collections/delete.test.js
packages/component-manuscript-manager/src/tests/fragmentsRecommendations/post.test.js 54 additions, 0 deletions

...t-manager/src/tests/fragmentsRecommendations/post.test.js
packages/component-manuscript/src/components/ManuscriptLayout.js 18 additions, 2 deletions

...s/component-manuscript/src/components/ManuscriptLayout.js
packages/component-manuscript/src/components/ManuscriptPage.js 16 additions, 2 deletions

...ges/component-manuscript/src/components/ManuscriptPage.js

with 509 additions and 37 deletions

Please register or to comment