Skip to content

Commit

Permalink
remoção de comentários nada importante
Browse files Browse the repository at this point in the history
Signed-off-by: marcosvpcortes <o.planeta@gmail.com>
  • Loading branch information
mvpcortes committed Nov 28, 2010
1 parent fd2c0c6 commit c9d085a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/main/java/br/uff/ic/gardener/client/ClientMerge.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import br.uff.ic.gardener.merge.IMerge;
import br.uff.ic.gardener.merge.MergeException;
import br.uff.ic.gardener.merge.MergeWithRegEx;
import br.uff.ic.gardener.patch.delta.FileInfo;
import br.uff.ic.gardener.util.FileHelper;
import br.uff.ic.gardener.util.UtilStream;
import br.uff.ic.gardener.workspace.Workspace;
Expand All @@ -25,6 +24,11 @@ public class ClientMerge {

public class ClientMergeException extends Exception
{
/**
*
*/
private static final long serialVersionUID = 920405757395138678L;

public ClientMergeException(String msg, Throwable t) {
super(msg, t);
}
Expand Down

0 comments on commit c9d085a

Please sign in to comment.