Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 胡逸飞_branch
# Conflicts: # doc/实践一/第一次实践分工.txt # doc/泛读报告.docx # src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin # src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin # src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin # src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk # src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6c4aab4a9b24edaa2025853ed462c4d65c3b6579d2fa2027813271cd71203272_bucket_0/graph.bin # src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6c4aab4a9b24edaa2025853ed462c4d65c3b6579d2fa2027813271cd71203272_bucket_1/graph.bin # src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6c4aab4a9b24edaa2025853ed462c4d65c3b6579d2fa2027813271cd71203272_bucket_2/graph.bin # src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6c4aab4a9b24edaa2025853ed462c4d65c3b6579d2fa2027813271cd71203272_bucket_3/graph.bin # src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out # src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml # src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml # src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml # src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json # src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar # src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt # src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.binpull/19/head
commit
817225aa53
@ -0,0 +1,2 @@
|
||||
add
|
||||
add
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\assets"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\assets"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitprojs\gitProject\src\Notes-master3\app\src\main\assets"/><source path="D:\gitprojs\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitprojs\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
|
||||
>>>>>>> 289da429637994c10825e1eebf0c601f925b33e8
|
||||
|
||||
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitprojs\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitprojs\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
>>>>>>> 289da429637994c10825e1eebf0c601f925b33e8
|
||||
|
||||
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitprojs\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitprojs\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
|
||||
>>>>>>> 289da429637994c10825e1eebf0c601f925b33e8
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
<<<<<<< HEAD
|
||||
#Fri Apr 07 16:47:35 CST 2023
|
||||
base.0=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
=======
|
||||
#Fri Apr 07 19:45:24 CST 2023
|
||||
base.0=D\:\\gitprojs\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
>>>>>>> 289da429637994c10825e1eebf0c601f925b33e8
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug
|
||||
net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug
|
||||
net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\generated\res\rs\debug
|
||||
net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
|
||||
net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
|
||||
net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug
|
||||
net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\res
|
||||
net.micode.notes.app-main-7 C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\res
|
||||
net.micode.notes.app-pngs-0 D:\gitprojs\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug
|
||||
net.micode.notes.app-resValues-1 D:\gitprojs\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug
|
||||
net.micode.notes.app-rs-2 D:\gitprojs\gitProject\src\Notes-master3\app\build\generated\res\rs\debug
|
||||
net.micode.notes.app-mergeDebugResources-3 D:\gitprojs\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
|
||||
net.micode.notes.app-mergeDebugResources-4 D:\gitprojs\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
|
||||
net.micode.notes.app-merged_res-5 D:\gitprojs\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug
|
||||
net.micode.notes.app-debug-6 D:\gitprojs\gitProject\src\Notes-master3\app\src\debug\res
|
||||
net.micode.notes.app-main-7 D:\gitprojs\gitProject\src\Notes-master3\app\src\main\res
|
||||
|
||||
Binary file not shown.
@ -1,20 +0,0 @@
|
||||
{
|
||||
"version": 3,
|
||||
"artifactType": {
|
||||
"type": "APK",
|
||||
"kind": "Directory"
|
||||
},
|
||||
"applicationId": "net.micode.notes",
|
||||
"variantName": "debug",
|
||||
"elements": [
|
||||
{
|
||||
"type": "SINGLE",
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 1,
|
||||
"versionName": "0.1",
|
||||
"outputFile": "app-debug.apk"
|
||||
}
|
||||
],
|
||||
"elementType": "File"
|
||||
}
|
||||
Loading…
Reference in new issue