local and remote browser should show files in conflict and offer ability to resolve the conflicts

Description

Now that conflict detection is working constantly, and the notifications are and since being provided via the android notification system and not via a dialog during update, the user must be given the ability to identify and resolve conflicts.

The code to identify conflicts should already be in place from a previous attempt, i believe there is an arraylist in the application layer that will need the files added to it from the conflicthandler.

Environment

None

Status

Assignee

Brian Gormanly

Reporter

Brian Gormanly

Labels

External issue ID

None

Time tracking

3h

Fix versions

Affects versions

1.0.9 Pro

Priority

Major
Configure