diff options
| author | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-07 15:31:44 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-07 15:31:44 +0200 |
| commit | c00d72bc4cdde1bde164e6174ab854f1ef4e7bfd (patch) | |
| tree | 1cfe2296adc3ef7324b0c3238a5b7f0dc04ba7bb /configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java | |
| parent | f2850bb028ff11c91adb370f5bd03899ac5022ec (diff) | |
Resolve conflicts
Diffstat (limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java index 0ceb459233b..2989eee0b55 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/ContentHandler.java @@ -3,13 +3,12 @@ package com.yahoo.vespa.config.server.http; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.container.jdisc.HttpResponse; -import com.yahoo.restapi.HttpURL.Path; +import ai.vespa.http.HttpURL.Path; import com.yahoo.restapi.SlimeJsonResponse; import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import java.io.InputStreamReader; -import java.util.Arrays; import java.util.Collections; import java.util.List; |