Update to LVGL 7.11.0 Final#244
Merged
JF002 merged 1 commit intoInfiniTimeOrg:developfrom Mar 21, 2021
Merged
Conversation
Collaborator
|
Thanks, git does not see any conflict any more. Do you know what was the issue? I'm still learning submodules, and I'm still afraid to break things if I'm not using it correctly. Also, in this PR (https://github.com/JF002/InfiniTime/pull/231/files), submodule got updated to, but with different file... Any idea what is happening? EDIT : submodule in #231 was not up to date, it seems to be fixed now. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update to LVGL 7.11.0 Final