From 7831b3d367c54dea2172ef238710e24392447f7b Mon Sep 17 00:00:00 2001
From: Givi Khojanashvili <gigovich@gmail.com>
Date: Tue, 14 Mar 2023 10:38:21 +0400
Subject: [PATCH] Use string types in the Rule as ID

---
 client/firewall/iptables/manager_linux.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/firewall/iptables/manager_linux.go b/client/firewall/iptables/manager_linux.go
index ba1d4340d..e5aafd6d8 100644
--- a/client/firewall/iptables/manager_linux.go
+++ b/client/firewall/iptables/manager_linux.go
@@ -19,7 +19,6 @@ const (
 
 // Manager of iptables firewall
 type Manager struct {
-<<<<<<< HEAD
 	mutex sync.Mutex
 
 	ipv4Client *iptables.IPTables