diff options
| author | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-06-15 08:35:46 +0200 |
|---|---|---|
| committer | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-06-15 08:35:46 +0200 |
| commit | c4087af65ddfd976f2a2513a773f50b1fd790336 (patch) | |
| tree | 649317db54a0eeb6c6d40b2a038f80ea6d845fa9 /org.eclipse.jgit | |
| parent | 9af5f1888e453590b555d23f23942a7b4cddd03d (diff) | |
| download | jgit-c4087af65ddfd976f2a2513a773f50b1fd790336.tar.gz jgit-c4087af65ddfd976f2a2513a773f50b1fd790336.zip | |
Remove unused import of ObjectInserter in ResolveMerger
Change-Id: I415894418f6fbe922c61294b21e15eee64e8a806
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 3 |
1 files changed, 1 insertions, 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 <christian.halstrick@sap.com>, - * Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com> + * Copyright (C) 2010-2012, Matthias Sohn <matthias.sohn@sap.com> * 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; |