[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] SF.net SVN: jedit:[14245]
From:       daleanson () users ! sourceforge ! net
Date:       2008-12-29 16:01:49
Message-ID: E1LHKYv-0003Xy-Ds () d5vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14245
          http://jedit.svn.sourceforge.net/jedit/?rev=14245&view=rev
Author:   daleanson
Date:     2008-12-29 16:01:49 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
fixed bad merge from update

Modified Paths:
--------------
    plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ResolveConflictDialog.java

Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ResolveConflictDialog.java
===================================================================
--- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ResolveConflictDialog.java	2008-12-29 \
                11:19:53 UTC (rev 14244)
+++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ResolveConflictDialog.java	2008-12-29 \
16:01:49 UTC (rev 14245) @@ -394,10 +394,9 @@
                                                                                 }
                                                                             }
                                                                             \
                ResolveConflictDialog.this.resolve();
-                                                                            \
SwingUtilities.invokeLater( r2d2 );  }
                                                                     };
-
+                                                            \
SwingUtilities.invokeLater( r2d2 );  }
                                                         catch ( Exception e ) {
                                                             e.printStackTrace();


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]