![]() Component locked |
The component was automatically locked because of an alert.
10 months ago
|
![]() Alert triggered |
Could not merge the repository.
10 months ago
|
![]() Repository rebase failed |
warning: skipped previously applied commit 515efb8 warning: skipped previously applied commit 865539c hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging language/te.json CONFLICT (add/add): Merge conflict in language/te.json error: could not apply 394bce3... Sushumna Rao <sushumnarao@gmail.com> updated Telugu translation using Weblate @ translate-h5p.tk. 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 394bce3... Sushumna Rao <sushumnarao@gmail.com> updated Telugu translation using Weblate @ translate-h5p.tk. (1)10 months ago |
![]() Repository notification received |
GitHub: https://github.com/NDLANO/h5p-sequence-process, master
10 months ago
|