Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.0][ADD] l10n_it_declaration_of_intent: adding maintainers #4492

Open
wants to merge 1 commit into
base: 16.0
Choose a base branch
from

Conversation

Borruso
Copy link
Contributor

@Borruso Borruso commented Dec 7, 2024

@francesco-ooops
Copy link
Contributor

@Borruso credo vada rigenerato il readme

@Borruso Borruso force-pushed the 16.0-add-l10n_it_declaration_of_intent-maintainers branch from 0f17134 to e3c0b13 Compare December 13, 2024 08:17
@Borruso
Copy link
Contributor Author

Borruso commented Dec 13, 2024

@Borruso credo vada rigenerato il readme

rigenerato

@francesco-ooops
Copy link
Contributor

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@francesco-ooops The rebase process failed, because command git rebase origin/16.0 failed with output:

Rebasing (1/1)
Auto-merging l10n_it_declaration_of_intent/README.rst
CONFLICT (content): Merge conflict in l10n_it_declaration_of_intent/README.rst
Auto-merging l10n_it_declaration_of_intent/__manifest__.py
Auto-merging l10n_it_declaration_of_intent/static/description/index.html
CONFLICT (content): Merge conflict in l10n_it_declaration_of_intent/static/description/index.html
error: could not apply e3c0b138d... [ADD] l10n_it_declaration_of_intent: adding maintainers
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply e3c0b138d... [ADD] l10n_it_declaration_of_intent: adding maintainers

@Borruso Borruso force-pushed the 16.0-add-l10n_it_declaration_of_intent-maintainers branch from e3c0b13 to 850c581 Compare January 17, 2025 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants