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 /vespajlib/abi-spec.json | |
| parent | f2850bb028ff11c91adb370f5bd03899ac5022ec (diff) | |
Resolve conflicts
Diffstat (limited to 'vespajlib/abi-spec.json')
| -rw-r--r-- | vespajlib/abi-spec.json | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json index 642fdd5c16f..ae69564b671 100644 --- a/vespajlib/abi-spec.json +++ b/vespajlib/abi-spec.json @@ -349,20 +349,6 @@ ], "fields": [] }, - "com.yahoo.net.DomainName": { - "superClass": "ai.vespa.validation.PatternedStringWrapper", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public static com.yahoo.net.DomainName of(java.lang.String)", - "public static java.lang.String requireLabel(java.lang.String)" - ], - "fields": [ - "public static final com.yahoo.net.DomainName localhost" - ] - }, "com.yahoo.net.HostName": { "superClass": "ai.vespa.validation.PatternedStringWrapper", "interfaces": [], |