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.

Sign up for GitHub

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

fix(ci): run merge aftering pulling from Lokalise #647

Merged
merged 3 commits into from
Nov 3, 2024
Merged

fix(ci): run merge aftering pulling from Lokalise #647

merged 3 commits into from
Nov 3, 2024

Commits on Nov 3, 2024

  1. fix(ci): run merge aftering pulling from Lokalise

    @zyf722
    zyf722 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    200139f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/zyf722/livecodes into i1… 

    …8next-integration-draft
    @zyf722
    zyf722 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    08497ae View commit details
    Browse the repository at this point in the history

  3. ci(i18n): add error message for merge conflicts

    @zyf722
    zyf722 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    6df01ba View commit details
    Browse the repository at this point in the history