Labels Milestones

2 #19

Merged

ppu9cqlvf merged 12 commits from 胡逸飞_branch into dev 3 years ago

Conversation 0 Commits 12 Files Changed 125

pfem87pty commented 3 years ago

Collaborator

There is no content yet.

pfem87pty added 12 commits 3 years ago

a29ea0df55 七

0ced0dda5a 1

d5fe6f84df 1

b4f592bacf Merge branch '胡逸飞_branch' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 胡逸飞_branch

4ad2764050 1

bf7df49c45 1

817225aa53 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.bin

6f0b43abee 1

eef3871881 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 胡逸飞_branch ...

# Conflicts:
#	doc/泛读报告.docx

cd7d80f038 1

3c6d6f375b 1

a62589e8cf 1

ppu9cqlvf merged commit 30096291bf into dev 3 years ago

The pull request has been merged as 30096291bf.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ppu9cqlvf/gitProject#19

Write Preview

Loading…

Cancel

Save

There is no content yet.