Skip to content

Conversation

Valdnet
Copy link
Contributor

@Valdnet Valdnet commented Apr 21, 2022

@Valdnet Valdnet added the feature: language/translations (l10n/i18n) Localization and translation matters label Apr 21, 2022
@Valdnet Valdnet self-assigned this Apr 21, 2022
@tcitworld
Copy link
Member

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Apr 22, 2022

/rebase

@Valdnet
Copy link
Contributor Author

Valdnet commented Apr 22, 2022

I am asking for a solution to the conflict. I cannot do it from GitHub 😬.

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
@Valdnet
Copy link
Contributor Author

Valdnet commented Apr 26, 2022

I am asking a merge.

@Valdnet Valdnet requested a review from szaimen April 27, 2022 08:00
@szaimen
Copy link
Contributor

szaimen commented Apr 27, 2022

/rebase

@rakekniven
Copy link
Member

rakekniven commented Jun 20, 2022

Node failed.

@szaimen What does "Check webpack build changes" mean?

@szaimen
Copy link
Contributor

szaimen commented Jun 20, 2022

/rebase

This was referenced Aug 12, 2022
This was referenced Aug 24, 2022
This was referenced Sep 6, 2022
@skjnldsv skjnldsv mentioned this pull request Sep 15, 2022
@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 19, 2022

/rebase

@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 19, 2022

How do I remove a conflict?

@tcitworld
Copy link
Member

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Sep 20, 2022

/compile amend /

This was referenced Sep 20, 2022
@blizzz blizzz modified the milestones: Nextcloud 25, Nextcloud 26 Sep 22, 2022
@blizzz blizzz mentioned this pull request Feb 1, 2023
@Valdnet
Copy link
Contributor Author

Valdnet commented Feb 1, 2023

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Feb 1, 2023

Please help me resolve the conflict. PR has been hanging for a long time, so changes cannot be made to the new version of NC.

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
@skjnldsv skjnldsv mentioned this pull request Feb 23, 2023
@blizzz blizzz mentioned this pull request Mar 7, 2023
@blizzz blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 9, 2023
@szaimen
Copy link
Contributor

szaimen commented Apr 17, 2023

follow-up in #37770

@szaimen szaimen closed this Apr 17, 2023
@szaimen szaimen deleted the Valdnet-patch-1 branch April 17, 2023 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature: language/translations (l10n/i18n) Localization and translation matters

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants