chore(mergeDevelop): fix merge conflicts (684c0247) · Commits · xpub / xpub-faraday

Commit 684c0247 authored 6 years ago by

Alexandru Munteanu

Browse files

chore(mergeDevelop): fix merge conflicts

parents bbebc685 67e520e9

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Automation/src/test/java/Utils.java 1 addition, 1 deletion

Automation/src/test/java/Utils.java
packages/component-email-templating/src/templates/partials/invButtons.hbs 4 additions, 4 deletions

...nt-email-templating/src/templates/partials/invButtons.hbs
packages/component-email-templating/src/templates/partials/invHeader.hbs 16 additions, 0 deletions

...ent-email-templating/src/templates/partials/invHeader.hbs
packages/component-faraday-selectors/src/index.js 79 additions, 23 deletions

packages/component-faraday-selectors/src/index.js
packages/component-faraday-ui/src/AuthorCard.js 3 additions, 12 deletions

packages/component-faraday-ui/src/AuthorCard.js
packages/component-faraday-ui/src/AuthorReply.js 1 addition, 1 deletion

packages/component-faraday-ui/src/AuthorReply.js
packages/component-faraday-ui/src/EditorialReportCard.js 2 additions, 2 deletions

packages/component-faraday-ui/src/EditorialReportCard.js
packages/component-faraday-ui/src/IconButton.js 10 additions, 4 deletions

packages/component-faraday-ui/src/IconButton.js
packages/component-faraday-ui/src/InviteReviewers.js 7 additions, 5 deletions

packages/component-faraday-ui/src/InviteReviewers.js
packages/component-faraday-ui/src/ManuscriptCard.js 1 addition, 1 deletion

packages/component-faraday-ui/src/ManuscriptCard.js
packages/component-faraday-ui/src/MenuCountry.js 81 additions, 0 deletions

packages/component-faraday-ui/src/MenuCountry.js
packages/component-faraday-ui/src/PasswordValidation.js 182 additions, 0 deletions

packages/component-faraday-ui/src/PasswordValidation.js
packages/component-faraday-ui/src/PasswordValidation.md 16 additions, 0 deletions

packages/component-faraday-ui/src/PasswordValidation.md
packages/component-faraday-ui/src/PersonInvitation.js 24 additions, 0 deletions

packages/component-faraday-ui/src/PersonInvitation.js
packages/component-faraday-ui/src/ReviewerReport.js 26 additions, 25 deletions

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

packages/component-faraday-ui/src/ReviewerReportAuthor.js
packages/component-faraday-ui/src/ReviewerReportAuthor.md 1 addition, 1 deletion

packages/component-faraday-ui/src/ReviewerReportAuthor.md
packages/component-faraday-ui/src/ReviewersTable.js 2 additions, 7 deletions

packages/component-faraday-ui/src/ReviewersTable.js
packages/component-faraday-ui/src/ShadowedBox.js 8 additions, 3 deletions

packages/component-faraday-ui/src/ShadowedBox.js
packages/component-faraday-ui/src/UserProfile.js 4 additions, 2 deletions

packages/component-faraday-ui/src/UserProfile.js

with 472 additions and 95 deletions

Please register or to comment