You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

GenshinGanyu ebb8c9e63b Merge remote-tracking branch 'origin/master' into qjy ... # Conflicts: # app/build/intermediates/dex/debug/mergeDexDebug/classes.dex # app/build/intermediates/dex_archive_input_jar_hashes/debug/out # app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # app/build/intermediates/incremental/mergeDebugAssets/merger.xml # app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml # app/build/intermediates/incremental/mergeDebugShaders/merger.xml # app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # app/build/intermediates/merged_manifest/debug/AndroidManifest.xml # app/build/intermediates/merged_manifests/debug/AndroidManifest.xml # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json # app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml # app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex # app/build/intermediates/source_set_path_map/debug/file-map.txt # app/build/outputs/logs/manifest-merger-debug-report.txt # app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin # local.properties		2 years ago
..
build	Merge remote-tracking branch 'origin/master' into qjy	2 years ago
src/main	Merge remote-tracking branch 'origin/master' into qjy	2 years ago
build.gradle	Initial commit	2 years ago