From cca34b3c6253ed77a2e72eaf1110e032ecc134d6 Mon Sep 17 00:00:00 2001 From: irengrig Date: Mon, 21 May 2012 15:36:10 +0400 Subject: [PATCH] svn tree conflicts - merge reworked - apply patch --- plugins/svn4idea/svn4idea.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/svn4idea/svn4idea.iml b/plugins/svn4idea/svn4idea.iml index 4459e1cfa32c..34af8777bc56 100644 --- a/plugins/svn4idea/svn4idea.iml +++ b/plugins/svn4idea/svn4idea.iml @@ -46,7 +46,7 @@ - +