Allow merging ranked votes of different ranks.

Kinematics · Sep 4, 2015 · e1f4cf6 · e1f4cf6
1 parent 9f8da7c
commit e1f4cf6
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/NetTally/MergeVotesWindow.xaml.cs b/NetTally/MergeVotesWindow.xaml.cs
@@ -150,12 +150,7 @@ public bool VotesCanMerge
                 if (CurrentVoteType == VoteType.Rank)
                 {
                     // Don't allow merging if they're not the same rank.
-
-                    string markFrom = VoteString.GetVoteMarker(fromVote);
-                    string markTo = VoteString.GetVoteMarker(toVote);
-
-                    if (markFrom != markTo)
-                        return false;
+                    // Changing: If they're not the same rank, the merge just changes the text of the "from" vote to the "to" vote
 
                     // Don't allow merging if they're not the same task.