Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ILazyContentProvider.java')
-rw-r--r--bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ILazyContentProvider.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ILazyContentProvider.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ILazyContentProvider.java
index 7ae961a7ac4..b978005a903 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ILazyContentProvider.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ILazyContentProvider.java
@@ -26,10 +26,7 @@ package org.eclipse.jface.viewers;
* require a call to <code>#setItemCount</code> on the
* viewer that uses it.
* @param <I> Type of the input for the view
-<<<<<<< HEAD
-=======
*
->>>>>>> 6d6b20c... Bug 413973 - [Viewers] Add generics to the TreeViewer
*/
public interface ILazyContentProvider<I> extends IContentProvider<I> {
/**

Back to the top