--- a/admin/resolveConflicts.php +++ b/admin/resolveConflicts.php @@ -1,7 +1,7 @@