From c4087af65ddfd976f2a2513a773f50b1fd790336 Mon Sep 17 00:00:00 2001 From: Tomasz Zarna Date: Fri, 15 Jun 2012 08:35:46 +0200 Subject: Remove unused import of ObjectInserter in ResolveMerger Change-Id: I415894418f6fbe922c61294b21e15eee64e8a806 --- org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 588d4b95b0..7b1b36c946 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2010, Christian Halstrick , - * Copyright (C) 2010, Matthias Sohn + * Copyright (C) 2010-2012, Matthias Sohn * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -78,7 +78,6 @@ import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.treewalk.CanonicalTreeParser; -- cgit v1.2.3