master
dev
# 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
# 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
ba0e2d0da8
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
ba0e2d0da8into dev 2 years agoba0e2d0da8.