aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test/tst/org
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2020-11-27 03:04:00 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2020-11-27 03:04:12 +0100
commitad902087820c1b2b3147b45ffbac4e3804274f9c (patch)
tree88eaf04463fc1d1462d8813b218d5cdcc8402fe6 /org.eclipse.jgit.test/tst/org
parent480b00f1c799bbd09bf747dca88c23a4844931cd (diff)
parentc2dfd68b73d002bb0df9c7a1a8e45a4a5c39b4fa (diff)
downloadjgit-ad902087820c1b2b3147b45ffbac4e3804274f9c.tar.gz
jgit-ad902087820c1b2b3147b45ffbac4e3804274f9c.zip
Merge branch 'stable-5.5' into stable-5.6
* stable-5.5: Remove unused imports Silence API warnings Remove erraneously merged source features Change-Id: Ifb6ebe56577719c0dfc6425557130b91e510d5c7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileTest.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileTest.java
index 0a3f89e238..e9c7f9aee0 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileTest.java
@@ -60,7 +60,6 @@ import java.util.Set;
import java.util.regex.Pattern;
import org.eclipse.jgit.internal.storage.file.LockFile;
-import org.eclipse.jgit.internal.transport.http.NetscapeCookieFile;
import org.eclipse.jgit.util.http.HttpCookiesMatcher;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;