From 1d15248e50a0027938f19f95d44a48884fb02c0c Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 1 Mar 2011 17:05:11 +0000 Subject: [PATCH] Release Bug 334839 - File Content Conflict is not handled properly --- releng/org.eclipse.tm.releng/maps/rse.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map index 4f6051d5f93..4011082d666 100644 --- a/releng/org.eclipse.tm.releng/maps/rse.map +++ b/releng/org.eclipse.tm.releng/maps/rse.map @@ -60,5 +60,5 @@ plugin@org.eclipse.rse.subsystems.terminals.ssh=v201101042155,:pserver:anonymous plugin@org.eclipse.rse.terminals.ui=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui plugin@org.eclipse.rse.tests=v201102010911,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests plugin@org.eclipse.rse.tests.framework=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework -plugin@org.eclipse.rse.ui=v201102281950,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui +plugin@org.eclipse.rse.ui=v201103011700,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui plugin@org.eclipse.rse.useractions=v201101042155,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions \ No newline at end of file