Merged PR 8419202: [202012]Fix merge conflict

Related work items: #118, #124, sonic-net#2827, sonic-net#2844, sonic-net#2852, sonic-net#2866, sonic-net#2873, sonic-net#15532, sonic-net#15543, sonic-net#15637
liushilongbuaa · Jul 12, 2023 · b5fe131 · b5fe131
2 parents 9bcbfc6 + 6a85621
commit b5fe131
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/sonic-telemetry b/src/sonic-telemetry
diff --git a/src/sonic-utilities b/src/sonic-utilities
+1 −0		Makefile
+3 −0		azure-pipelines.yml
+3 −3		sonic_data_client/db_client.go
+10 −0		config/vlan.py
+1 −1		scripts/route_check.py
+2 −2		show/dhcp_relay.py
+4 −1		tests/mock_tables/state_db.json
+17 −14		tests/show_dhcp_relay_test.py
+6 −4		tests/vlan_test.py