Skip to content

Commit 5f3e746

Browse files
committed
fix conflict
1 parent 07d576b commit 5f3e746

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

NOTICE.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7568,6 +7568,35 @@ THE SOFTWARE.
75687568

75697569

75707570

7571+
--------------------------------------------------------------------------------
7572+
Dependency : github.com/brianvoe/gofakeit
7573+
Version: v3.18.0+incompatible
7574+
Licence type (autodetected): MIT
7575+
--------------------------------------------------------------------------------
7576+
7577+
Contents of probable licence file $GOMODCACHE/github.com/brianvoe/[email protected]+incompatible/LICENSE.txt:
7578+
7579+
The MIT License (MIT)
7580+
7581+
Copyright (c) [year] [fullname]
7582+
7583+
Permission is hereby granted, free of charge, to any person obtaining a copy of
7584+
this software and associated documentation files (the "Software"), to deal in
7585+
the Software without restriction, including without limitation the rights to
7586+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
7587+
the Software, and to permit persons to whom the Software is furnished to do so,
7588+
subject to the following conditions:
7589+
7590+
The above copyright notice and this permission notice shall be included in all
7591+
copies or substantial portions of the Software.
7592+
7593+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
7594+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
7595+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
7596+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
7597+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
7598+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
7599+
75717600
--------------------------------------------------------------------------------
75727601
Dependency : github.com/cavaliergopher/rpm
75737602
Version: v1.2.0

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ require (
232232

233233
require (
234234
github.com/apache/arrow-go/v18 v18.4.1
235+
github.com/brianvoe/gofakeit v3.18.0+incompatible
235236
github.com/elastic/gokrb5/v8 v8.0.0-20251105095404-23cc45e6a102
236237
github.com/gorilla/mux v1.8.1
237238
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 h1:oMCHnXa6CCCafdPDb
252252
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
253253
github.com/bluekeyes/go-gitdiff v0.7.1 h1:graP4ElLRshr8ecu0UtqfNTCHrtSyZd3DABQm/DWesQ=
254254
github.com/bluekeyes/go-gitdiff v0.7.1/go.mod h1:QpfYYO1E0fTVHVZAZKiRjtSGY9823iCdvGXBcEzHGbM=
255+
github.com/brianvoe/gofakeit v3.18.0+incompatible h1:wDOmHc9DLG4nRjUVVaxA+CEglKOW72Y5+4WNxUIkjM8=
256+
github.com/brianvoe/gofakeit v3.18.0+incompatible/go.mod h1:kfwdRA90vvNhPutZWfH7WPaDzUjz+CZFqG+rPkOjGOc=
255257
github.com/cavaliergopher/rpm v1.2.0 h1:s0h+QeVK252QFTolkhGiMeQ1f+tMeIMhGl8B1HUmGUc=
256258
github.com/cavaliergopher/rpm v1.2.0/go.mod h1:R0q3vTqa7RUvPofAZYrnjJ63hh2vngjFfphuXiExVos=
257259
github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=

0 commit comments

Comments
 (0)