Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	screen_brightness/example/pubspec.lock
  • Loading branch information
aaassseee committed Oct 12, 2024
2 parents d895796 + 15a3458 commit 3e7c3d3
Show file tree
Hide file tree
Showing 54 changed files with 2,646 additions and 1,278 deletions.
15 changes: 14 additions & 1 deletion .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

96 changes: 0 additions & 96 deletions .idea/modules/app/android.app.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3e7c3d3

Please sign in to comment.