Fix merge conflicts

nginx · Apr 16, 2024 · 53c3172 · 53c3172
1 parent 089534b
commit 53c3172
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/internal/telemetry/collector_test.go b/internal/telemetry/collector_test.go
@@ -8,8 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/nginxinc/kubernetes-ingress/internal/k8s/secrets"
-
 	"github.com/nginxinc/kubernetes-ingress/internal/configs"
 	"github.com/nginxinc/kubernetes-ingress/internal/configs/version1"
 	"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"

diff --git a/internal/telemetry/data.avdl b/internal/telemetry/data.avdl
@@ -50,5 +50,6 @@ It is the UID of the `kube-system` Namespace. */
 
 		/** Ingresses is the number of Ingresses. */
 		long? Ingresses = null;
+
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,5 +50,6 @@ It is the UID of the `kube-system` Namespace. */ @@
     		/** Ingresses is the number of Ingresses. */
     		long? Ingresses = null;
     	}
     }