21373147 #1

Open

buaa21373147 wants to merge 31 commits from master into Feature-21373147

buaa21373147 commented

Owner

There is no content yet.

buaa21373147 added 31 commits

5ef4b3bc0b 21373146 lab01 t9 t8

206fbdeddf 21371518-Feature

947e4dbb4b Merge pull request '21371518' (#1 ) from Feature-21371518 into dev

798fe19c4e Merge pull request '21373147' (#2 ) from Feature-21373147 into dev

63bbf1d5ce feature 21371326 commit

291236c41d remove .nfs file

b1906a2b57 Merge branch 'dev' of https://bdgit.educoder.net/buaa21371518/BUAA-SE-2023-Lab01-Group4 into dev

pull dev when remve .nfs

502a348ca5 merge 21371326

d10c60683c 合作PR

5c30c4c589 把mian改成main

cde1b6522f 21371326 modify main.py

75585eb1a2 Merge pull request '第三关PR21371518' (#4 ) from Feature-21371518 into dev

5e50264697 Merge branch 'Feature-21371326' of https://bdgit.educoder.net/buaa21371326/BUAA-SE-2023-Lab01-Group4 into Feature-21371326

b8181b3ebe Merge branch 'Feature-21371326' of https://bdgit.educoder.net/buaa21371326/BUAA-SE-2023-Lab01-Group4 into Feature-21371326

merge feature21371326 to push

9984e32b94 Conflict Solved

0ad4a89246 resolve conflict in question3

94df0988ab Conflict Solved

e84f8253a7 Merge pull request 'feature21371326 to dev' (#6 ) from buaa21371326/BUAA-SE-2023-Lab01-Group4:Feature-21371326 into master

b4506265ef 21373146 t10 2

8e561103ff Conflict solved

94bae5539d Merge pull request '21373146陈心扬第十题第二关' (#7 ) from Feature-21373146 into dev

6927d9fbe2 21371389py

01ec90149c Function-21371389.py submitted

5ad84e55ae Merge branch 'Student-21371389' into dev

eb0ea8dc4b main.py modified

3c5b4d238b Merge branch 'Student-21371389' into dev

b50968bd20 Function-21371389 modified

956f9d75e5 同意合并

0d7d5b5381 feature function 21371389

7e70c344ea 同意PR请求

c0948a3346 scasd

This pull request cannot be merged automatically due to conflicts.

Merge manually to resolve the conflicts.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: buaa21373147/BUAA-SE-2023-Lab01-Group4#1