Merge branch 'develop' of https://bdgit.educoder.net/pfinzu3bk/xiaomi_Note into develop
# Conflicts: # src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.bin # src/Notes-master/.gradle/7.3.3/executionHistory/executionHistory.lock # src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.bin # src/Notes-master/.gradle/7.3.3/fileHashes/fileHashes.lock # src/Notes-master/.gradle/7.3.3/fileHashes/resourceHashesCache.bin # src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin # src/Notes-master/.gradle/file-system.probe # src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk # src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar # src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin # src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin # src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin # src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex # src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class # src/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json # src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex # src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt # src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt # src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bindevelop
commit
5df2e3c05a
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue