Revert "-Resolving conflicts"

This reverts commit f41b14a.
openconfig · Dec 3, 2024 · 74348f7 · 74348f7
1 parent f41b14a
commit 74348f7
Show file tree

Hide file tree

Showing 30 changed files with 610 additions and 2,001 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,7 +12,7 @@
 
 # /feature folders each have owners who are auto requested for review and may merge PR's
 /feature/acl/          @alokmtri-g
-/feature/aft/          @sudhinj @yunjie-lu
+/feature/aft/          @sudhinj
 /feature/bgp/          @dplore
 /feature/dhcp/         @alokmtri-g
 /feature/ethernet/     @ram-mac

diff --git a/feature/aft/aft_base/otg_tests/afts_base/README.md b/feature/aft/aft_base/otg_tests/afts_base/README.md
diff --git a/feature/aft/aft_base/otg_tests/afts_prefix_counters/README.md b/feature/aft/aft_base/otg_tests/afts_prefix_counters/README.md
diff --git a/...sts/route_summary_counters_test/README.md → ...sts/route_summary_counters_test/README.md b/...sts/route_summary_counters_test/README.md → ...sts/route_summary_counters_test/README.md
diff --git a/..._summary_counters_test/metadata.textproto → ..._summary_counters_test/metadata.textproto b/..._summary_counters_test/metadata.textproto → ..._summary_counters_test/metadata.textproto
diff --git a/...nters_test/route_summary_counters_test.go → ...nters_test/route_summary_counters_test.go b/...nters_test/route_summary_counters_test.go → ...nters_test/route_summary_counters_test.go