Fix conflicts (2c5254d0) · 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.

2c5254d0

Commit 2c5254d0 authored 7 years ago by

Alexandru Munteanu

Downloads
- Plain Diff

Fix conflicts

parents 515cf011 0f30ec07

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-wizard/src/components/WizardFormStep.js 44 additions, 12 deletions

packages/component-wizard/src/components/WizardFormStep.js
packages/component-wizard/src/components/WizardPage.js 22 additions, 5 deletions

packages/component-wizard/src/components/WizardPage.js
packages/component-wizard/src/components/WizardStep.js 22 additions, 6 deletions

packages/component-wizard/src/components/WizardStep.js
packages/component-wizard/src/components/WizardStep.local.scss 5 additions, 0 deletions

...ges/component-wizard/src/components/WizardStep.local.scss
packages/xpub-faraday/app/app.js 1 addition, 1 deletion

packages/xpub-faraday/app/app.js
packages/xpub-faraday/app/config/journal/article-sections-tbrm.js 30 additions, 0 deletions

.../xpub-faraday/app/config/journal/article-sections-tbrm.js
packages/xpub-faraday/app/config/journal/article-types-tbrm.js 18 additions, 0 deletions

...ges/xpub-faraday/app/config/journal/article-types-tbrm.js
packages/xpub-faraday/app/config/journal/index.js 2 additions, 0 deletions

packages/xpub-faraday/app/config/journal/index.js
packages/xpub-faraday/app/config/journal/submit-wizard.js 8 additions, 7 deletions

packages/xpub-faraday/app/config/journal/submit-wizard.js
packages/xpub-faraday/app/config/journal/wizard-validators.js 5 additions, 2 deletions

...ages/xpub-faraday/app/config/journal/wizard-validators.js
packages/xpub-faraday/config/validations.js 17 additions, 6 deletions

packages/xpub-faraday/config/validations.js

with 174 additions and 39 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