版本控制 #13

# Conflicts:
#	app/src/main/java/net/micode/notes/tool/BackupUtils.java
#	app/src/main/java/net/micode/notes/tool/DataUtils.java
#	app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
#	app/src/main/java/net/micode/notes/tool/ResourceParser.java
#	app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
#	app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
#	app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
#	app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
#	src/.idea/modules/app/minote.app.androidTest.iml

b48f8248c6 更改

8d860e7a00 修改

c1a759803c 分组注释

ce28b7edc9 Merge branch 'master' into cyx_branch

# Conflicts:
#	src/.idea/deploymentTargetDropDown.xml
#	src/.idea/modules/app/minote.app.androidTest.iml
#	src/.idea/modules/app/minote.app.iml
#	src/.idea/modules/app/minote.app.main.iml
#	src/.idea/modules/app/minote.app.unitTest.iml
#	src/minote.iml

49f90c91d5 Merge pull request '蔡玉祥的注释' (#12 ) from cyx_branch into master

abfa3096e7 注释

25eb5a04c0 注释

mbhvfy6mx merged commit b6277b06e6 into zxy_branch 2 years ago

mbhvfy6mx referenced this issue from a commit

Merge pull request '版本控制' (#13) from master into zxy_branch

The pull request has been merged as b6277b06e6.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: mbhvfy6mx/gitProject#13