conflict in manifest fixed

This commit is contained in:
2025-01-23 13:59:25 -05:00
323 changed files with 12274 additions and 11267 deletions

View File

@@ -1,2 +1,2 @@
#Fri Jan 10 12:00:11 EST 2025
#Thu Jan 23 13:10:53 EST 2025
java.home=C\:\\Program Files\\Android\\Android Studio\\jbr

Some files were not shown because too many files have changed in this diff Show More