Skip to content

Conversation

@sequensucks
Copy link
Contributor

fix #1226

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Copy link
Collaborator

@bartoszherba bartoszherba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add a german translation and we can move on. Also please, update the issue description, checkboxes and so on.

@sequensucks
Copy link
Contributor Author

@bartoszherba added from a google translate. I don't know german=)

@bartoszherba
Copy link
Collaborator

@sequensucks Please, fix conflicts.

@sequensucks
Copy link
Contributor Author

@bartoszherba merged a current develop branch

@bartoszherba
Copy link
Collaborator

@sequensucks Please, resolve conflicts.

@sequensucks
Copy link
Contributor Author

@bartoszherba merged a current develop branch

@bartoszherba
Copy link
Collaborator

@sequensucks There are still conflicts.

@sequensucks
Copy link
Contributor Author

i synchronized a fork and merged into my branch.

@bartoszherba
Copy link
Collaborator

@sequensucks How's going on solving conflicts?

@sequensucks
Copy link
Contributor Author

@bartoszherba i don't know where is a problem=(
i haven't conflicts.
I clicked a sync a fork (develop branch).
and merged a develop to my branch. Got up to date and nothing to merged.
Github is saying
image

@bartoszherba bartoszherba merged commit f5982e2 into vuestorefront:develop Aug 23, 2022
Frodigo pushed a commit that referenced this pull request Sep 5, 2022
* fix: fix a message about submitted review

fix #1226

* fix: add DE translates
@Frodigo Frodigo added this to the 1.1.0 milestone Sep 5, 2022
@Frodigo Frodigo mentioned this pull request Sep 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants