From 163c0bc0b72019d00df12e16038684416428a656 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@apache.org>
Date: Sat, 21 Feb 2015 16:52:50 +0000
Subject: [PATCH] LUCENE-6270: Fix merge issues with LUCENE-6272.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1661396 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/lucene/queries/TermsQuery.java | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
index 20a12f4c2eb..ca6746ac055 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java
@@ -415,26 +415,6 @@ public class TermsQuery extends Query implements Accountable {
             return 1;
           }
 
-          @Override
-          public int nextPosition() throws IOException {
-            return -1;
-          }
-
-          @Override
-          public int startOffset() throws IOException {
-            return -1;
-          }
-
-          @Override
-          public int endOffset() throws IOException {
-            return -1;
-          }
-
-          @Override
-          public BytesRef getPayload() throws IOException {
-            return null;
-          }
-
           @Override
           public int docID() {
             return disi.docID();