feat: Resolved merge conflicts

werniq · Sep 6, 2024 · d06db94 · d06db94
1 parent 3c37518
commit d06db94
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 2,340 deletions.
diff --git a/operator/api/v1/hotnews_types.go b/operator/api/v1/hotnews_types.go
diff --git a/operator/api/v1/hotnews_types_test.go b/operator/api/v1/hotnews_types_test.go