From 41102004a22e309a1a4dbf544d3d13da5d98bead Mon Sep 17 00:00:00 2001
From: Josef Johansson <josef@oderland.se>
Date: Sun, 5 Nov 2023 19:48:11 +0100
Subject: [PATCH] Update smart_test.go: Remove diff-tags

---
 plugins/inputs/smart/smart_test.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/inputs/smart/smart_test.go b/plugins/inputs/smart/smart_test.go
index e0858dad44aca..1d79b0475a26e 100644
--- a/plugins/inputs/smart/smart_test.go
+++ b/plugins/inputs/smart/smart_test.go
@@ -2407,7 +2407,6 @@ cntlid  : 0
 ver     : 0
 rtd3r   : 0
 rtd3e   : 0
-<<<<<<< HEAD
 oaes    : 0
 ctratt  : 0
 oacs    : 0x6