From 4f69c4a7d3bc07aad187ebd6a5151fa84d3ab96e Mon Sep 17 00:00:00 2001
From: Rajesh Sankaran <rajesh.sankaran@broadcom.com>
Date: Fri, 18 Sep 2020 08:29:46 -0700
Subject: [PATCH] rebase with master

---
 orchagent/portsorch.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/orchagent/portsorch.h b/orchagent/portsorch.h
index f7b50ae042..b6ceeade7c 100755
--- a/orchagent/portsorch.h
+++ b/orchagent/portsorch.h
@@ -235,9 +235,6 @@ class PortsOrch : public Orch, public Subject
     bool addTunnel(string tunnel,sai_object_id_t, bool learning=true);
     bool removeTunnel(Port tunnel);
 
-    bool addTunnel(string tunnel,sai_object_id_t, bool learning=true);
-    bool removeTunnel(Port tunnel);
-
     bool addPort(const set<int> &lane_set, uint32_t speed, int an=0, string fec="");
     sai_status_t removePort(sai_object_id_t port_id);
     bool initPort(const string &alias, const int index, const set<int> &lane_set);