From e1f4cf6b2a2fc382070cd45b410711dfa15d9881 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@datasync.com>
Date: Fri, 4 Sep 2015 17:08:03 -0500
Subject: [PATCH] Allow merging ranked votes of different ranks.

---
 NetTally/MergeVotesWindow.xaml.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/NetTally/MergeVotesWindow.xaml.cs b/NetTally/MergeVotesWindow.xaml.cs
index b621d451..fd26e1d3 100644
--- 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.