Fix merge conflicts (68c5d254) · 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.

68c5d254

Commit 68c5d254 authored 7 years ago by

Alexandru Munteanu

Downloads
- Plain Diff

Fix merge conflicts

parents 6cb28470 b88899ac

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-wizard/src/components/WizardFormStep.js 33 additions, 4 deletions

packages/component-wizard/src/components/WizardFormStep.js
packages/component-wizard/src/components/WizardPage.js 9 additions, 0 deletions

packages/component-wizard/src/components/WizardPage.js
packages/component-wizard/src/components/WizardStep.js 8 additions, 0 deletions

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

...ges/component-wizard/src/components/WizardStep.local.scss
packages/xpub-faraday/app/config/journal/submit-wizard.js 1 addition, 0 deletions

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

packages/xpub-faraday/app/routes.js

with 70 additions and 4 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