From d00e25210520a341318677aa9ce56ee29dfbf408 Mon Sep 17 00:00:00 2001
From: Olesya Smirnova <Olesya.Smirnova@jetbrains.com>
Date: Tue, 14 Dec 2004 16:19:11 +0300
Subject: [PATCH] (no message)

---
 plugins/svn4idea/META-INF/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/svn4idea/META-INF/plugin.xml b/plugins/svn4idea/META-INF/plugin.xml
index 434f4c7ecb80..69b9bc782d07 100644
--- a/plugins/svn4idea/META-INF/plugin.xml
+++ b/plugins/svn4idea/META-INF/plugin.xml
@@ -51,7 +51,7 @@
       <action id="Subversion.Update" class="com.qintsoft.svn4idea.actions.UpdateAction" text="Update file" description="Update the file from Subversion"/>
       -->
       <action id="Subversion.Revert" class="com.qintsoft.svn4idea.actions.RevertAction" text="Revert file" description="Revert file to repository state"/>
-      <!--<action id="Subversion.Resolved" class="com.qintsoft.svn4idea.actions.ResolveAction" text="Resolved confilct" description="Tell Subversion that the conflict has been resolved"/>-->
+      <action id="Subversion.Resolved" class="com.qintsoft.svn4idea.actions.ResolveAction" text="Resolved confilct" description="Tell Subversion that the conflict has been resolved"/>
       <separator/>
       <reference id="Subversion.ShowDiffAction"/>
       <!--