Merge branch 'main' of https://bdgit.educoder.net/pjfycu7ae/Micode
# Conflicts:
# src/Notes-master/src/net/micode/notes/data/Notes.java
# src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java
# src/Notes-master/src/net/micode/notes/data/NotesProvider.java
# src/Notes-master/src/net/micode/notes/model/Note.java
# src/Notes-master/src/net/micode/notes/model/WorkingNote.java
# src/Notes-master/src/net/micode/notes/tool/BackupUtils.java
# src/Notes-master/src/net/micode/notes/tool/DataUtils.java
# src/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java
# src/Notes-master/src/net/micode/notes/tool/ResourceParser.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
# src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
|
zhm