From 4cea221f957fe6f35237895550d65c7d402d2cee Mon Sep 17 00:00:00 2001
From: Benedict Elliott Smith <benedict@apache.org>
Date: Wed, 15 Jul 2015 11:43:25 +0100
Subject: [PATCH] fix bad merge/rebase

---
 .../org/apache/cassandra/db/partitions/PartitionUpdate.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
index 09e4c03a6c..670b1ae947 100644
--- a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
+++ b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
@@ -470,12 +470,6 @@ public class PartitionUpdate extends AbstractPartitionData implements Sorting.So
         sort();
     }
 
-    public int rowCount()
-    {
-        maybeSort();
-        return super.rowCount();
-    }
-
     private synchronized void sort()
     {
         if (isSorted)