liuyan_branch
master
# Conflicts: # src/Notes-master/src/net/micode/notes/data/Contact.java # 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/gtask/data/MetaData.java # src/Notes-master/src/net/micode/notes/gtask/data/Node.java # src/Notes-master/src/net/micode/notes/gtask/data/SqlData.java # src/Notes-master/src/net/micode/notes/gtask/data/SqlNote.java # src/Notes-master/src/net/micode/notes/gtask/data/Task.java # src/Notes-master/src/net/micode/notes/gtask/data/TaskList.java # src/Notes-master/src/net/micode/notes/gtask/exception/ActionFailureException.java # src/Notes-master/src/net/micode/notes/gtask/exception/NetworkFailureException.java # src/Notes-master/src/net/micode/notes/gtask/remote/GTaskASyncTask.java # src/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java # src/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java # src/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java # src/Notes-master/src/net/micode/notes/model/Note.java # src/Notes-master/src/net/micode/notes/model/WorkingNote.java
ea3403f411
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
ea3403f411into master 3 weeks agoea3403f411.