fix merge conflicts

agent/grpc-middleware/rate_limit_mappings.gen.go

@@ -1,6 +1,3 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
 // generated by protoc-gen-consul-rate-limit; DO NOT EDIT.
 package middleware
 

agent/uiserver/dist/assets/chunk.178.00380c6ad3fa678e07b6.js

@@ -1,8 +1,3 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 var __ember_auto_import__;(()=>{var r,e={6760:function(r,e){window._eai_r=require,window._eai_d=define},4593:(r,e,t)=>{var o,n
 r.exports=(o=_eai_d,n=_eai_r,window.emberAutoImportDynamic=function(r){return 1===arguments.length?n("_eai_dyn_"+r):n("_eai_dynt_"+r)(Array.prototype.slice.call(arguments,1))},window.emberAutoImportSync=function(r){return n("_eai_sync_"+r)(Array.prototype.slice.call(arguments,1))},o("lodash.castarray",[],(function(){return t(5665)})),o("lodash.last",[],(function(){return t(66)})),o("lodash.omit",[],(function(){return t(9254)})),o("qunit",[],(function(){return t(3409)})),void o("yadda",[],(function(){return t(409)})))},9265:()=>{},3642:()=>{}},t={}
 function o(r){var n=t[r]

agent/uiserver/dist/assets/chunk.744.c0eb6726020fc4af8d3f.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 "use strict";(globalThis.webpackChunk_ember_auto_import_=globalThis.webpackChunk_ember_auto_import_||[]).push([[744],{7744:(_,e,a)=>{a.r(e)}}])

agent/uiserver/dist/assets/consul-acls/routes-0c01f9c463b81fdc3929288f31c23040.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.routes=JSON.stringify(e)})({dc:{acls:{tokens:{_options:{abilities:["read tokens"]}}}}})

agent/uiserver/dist/assets/consul-acls/services-70b9e635f1e8e9a316e3773fccadb7c7.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.services=JSON.stringify(e)})({})

agent/uiserver/dist/assets/consul-hcp/routes-282630d2b2c8bf766b7e0d4f512828cc.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.routes=JSON.stringify(e)})({dc:{show:null}})

agent/uiserver/dist/assets/consul-hcp/services-51af43ae095119987dadf6f2392a59b3.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,o=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{o.services=JSON.stringify(e)})({"component:consul/hcp/home":{class:"consul-ui/components/consul/hcp/home"}})

agent/uiserver/dist/assets/consul-lock-sessions/routes-7718d309039e9f8b3b185656b6dd7f05.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((s,e=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{e.routes=JSON.stringify(s)})({dc:{nodes:{show:{sessions:{_options:{path:"/lock-sessions"}}}}}})

agent/uiserver/dist/assets/consul-lock-sessions/services-70b9e635f1e8e9a316e3773fccadb7c7.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.services=JSON.stringify(e)})({})

agent/uiserver/dist/assets/consul-nspaces/services-70b9e635f1e8e9a316e3773fccadb7c7.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.services=JSON.stringify(e)})({})

agent/uiserver/dist/assets/consul-partitions/services-1a3b6937a8bc5f6e68df884b1650eaf0.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,t=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{t.services=JSON.stringify(e)})({"component:consul/partition/selector":{class:"consul-ui/components/consul/partition/selector"}})

agent/uiserver/dist/assets/consul-peerings/services-e5a754eca7f3fbb406035f10b8dfbb77.js

@@ -1,6 +1 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
 ((e,o=("undefined"!=typeof document?document.currentScript.dataset:module.exports))=>{o.services=JSON.stringify(e)})({"component:consul/peer/selector":{class:"consul-ui/components/consul/peer/selector"}})