summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2020-04-27 14:26:36 +0200
committerØyvind Grønnesby <oyving@verizonmedia.com>2020-04-27 14:26:36 +0200
commitdfc3ea8a384311135580fc856fde3808640ffeae (patch)
treeb1d251f99ddc132e0a5f8e9ee88b28b7fd3e28bf /controller-api
parenta8467b2d5dd932512219d8eeee9fd73e8a2b267b (diff)
Fix conflict in path specs
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
index 66b06949793..ced3d201f6f 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
@@ -71,7 +71,6 @@ enum PathGroup {
billingInstrument(Matcher.tenant,
PathPrefix.api,
- "/billing/v1/tenant/{tenant}/instrument",
"/billing/v1/tenant/{tenant}/instrument/{*}"),
billingList(Matcher.tenant,