From 590aafc160161db43d5b8a65268e7eddd412d47b Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Fri, 14 Oct 2011 14:55:08 +0200 Subject: [PATCH] cleanup --- .../cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties | 1 - .../intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form | 1 - .../cvsoperations/cvsTagOrBranch/CreateTagDialog.form | 1 - .../cvsoperations/cvsUpdate/ui/UpdateOptionsDialog.form | 1 - 4 files changed, 4 deletions(-) diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties index 2b704c3ddbe9..474addf7d035 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties @@ -327,7 +327,6 @@ radio.corrupted.project.files.show.this.dialog=Show this dialog label.corrupted.project.files.in.the.future=In the future: label.corrupted.project.files.description=Project file c:/test/test.ipr
cannot be merged without conflict.
Click 'Skip' to skip all changes in repository for this file.
Click 'Get' to skip local changes and get repository version for this file.
Click 'Skip All' to skip checkbox.update.options.clean.copy.m=&Clean copy (-C) -checkbo.update.options.clean.copy=Clean copy (-C) checkbo.update.options.create.new.directories=Create new d&irectories (-d) checkbo.update.options.prune.empty.directories=&Prune empty directories (-P) checkbo.update.options.reset.sticky.data=Reset sticky d&ata (-A) diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form index 18420406c649..57f73e2ada0b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form @@ -80,7 +80,6 @@ - diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/CreateTagDialog.form b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/CreateTagDialog.form index 202b83d45d4d..991490a49337 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/CreateTagDialog.form +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/CreateTagDialog.form @@ -74,7 +74,6 @@ - diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsDialog.form b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsDialog.form index 82e5ad6d8fb3..dce1273bb1f0 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsDialog.form +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsDialog.form @@ -159,7 +159,6 @@ -