Changed listbox in ConflictsView.xaml to datagrid
-rw-r--r-- 982 .gitgnore
drwxr-xr-x - trunk