From 63b88bc9a946faa24033d3fc9222e1c053a18a9b Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Wed, 20 Aug 2003 18:03:03 +0000
Subject: Fixed NPE

---
 .../src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
index 9e651c008..e62c0e7a2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
@@ -141,8 +141,8 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 	 * @see org.eclipse.team.core.sync.TeamSubscriber#cancel()
 	 */
 	public void cancel() {
-		super.cancel();		
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);		
+		super.cancel();
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
 		TeamProvider.deregisterSubscriber(this);		
 		remoteSynchronizer.dispose();
 		baseSynchronizer.dispose();
-- 
cgit v1.2.3