修复合并冲突 #27

Closed

p7fulywfa wants to merge 35 commits from master into tangbo_branch

p7fulywfa commented

Collaborator

修复合并冲突

p7fulywfa added 35 commits

5221b2434d Merge pull request '合并代码注释，添加了data、gtask、tool三个包的注释' (#9 ) from tangbo_branch into master

ec8b0436ef 文档修改

e3a1d27cf6 提交小米便签的质量分析报告文档

d03c1fe5df 修改质量分析报告

2e58c25abf 文档修改

97c874815f 修复了小米便签主界面底部写便签按钮被系统UI遮挡的问题

9e72eb81c6 Merge pull request '修复小米便签主界面底部写便签按钮被白色ui框遮挡的问题' (#10 ) from taojunyu_branch into master

a5a619b01c UI遮挡问题的补充修改

c42e585e08 Merge pull request '撤销了部分错误修改' (#11 ) from taojunyu_branch into master

c26bb0d60b Merge pull request '解决了在文件夹中点击back键会直接退出小米便签的bug' (#12 ) from tangbo_branch into master

0f676498c5 Merge pull request '新增为便签加密功能' (#13 ) from taojunyu_branch into master

b3d7c1a32c 新增了为便签加密的功能

4426200dfd Merge pull request '新增了文件夹嵌套的功能' (#14 ) from tangbo_branch into master

3facc601a2 修复了小米便签主界面底部系统栏显示不全的问题

4bd28062bf Merge pull request ' 修复小米便签底部系统栏只显示一半的问题' (#15 ) from taojunyu_branch into master

960eb0b233 Merge pull request '新增富文本编辑功能' (#16 ) from tangbo_branch into master

7a9a171034 Merge pull request '新增了自动删除空白便签的功能' (#17 ) from tangbo_branch into master

78adb84048 添加最近删除功能

a6fec72005 Merge pull request '新增回收站功能' (#18 ) from taojunyu_branch into master

4ade8df1f4 上传代码备份

c936ba456d Merge pull request '重新合并，上传误删代码' (#19 ) from taojunyu_branch into master

0f51cc05e6 taojunyu_branch合并错误，重新上传代码备份

4f90f1643d 实现回收站

39c703c6e5 Merge pull request '实现回收站和修复搜索功能' (#20 ) from taojunyu_branch into master

672abc00e6 Merge pull request '新增了便签模板的功能' (#21 ) from tangbo_branch into master

d88918c6ec 补传之前未上传的文件

4f078b40cd 解决合并冲突问题

0411508bf3 清空重传

436a9d32f5 Merge pull request '增加回收站功能' (#23 ) from taojunyu_branch into master

66fa79abe2 修改

b8ffc7d30a 清空

0df7b98ad4 重传

026dee7711 清空

62df2add6e 重传

bdb0d92d7c Merge pull request '测试有没有合并冲突' (#24 ) from taojunyu_branch into master

p7fulywfa closed this pull request

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: p3f2h9ljk/git-test#27