Dropbox Conflicted Manager Code

Fix Dropbox Conflicted Files

Brought to you by: randallflagg

HTTPS access

File	Date	Author	Commit
DCM.UI.WMF	2014-10-26	git	[569965] NOT BUILDING - Commit just to save in repository
DCM.UI.WPF	2014-10-26	git	[569965] NOT BUILDING - Commit just to save in repository
DropboxConflictedManager	2014-10-26	git	[569965] NOT BUILDING - Commit just to save in repository
.gitignore	2014-10-26	git	[569965] NOT BUILDING - Commit just to save in repository
DropboxConflictedManager.sln	2014-10-26	git	[569965] NOT BUILDING - Commit just to save in repository