diff options
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb62ca32424..20f68f1634a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -332,11 +332,7 @@ M: Dave Barach <dave@barachs.net> F: src/plugins/nsim/ Test Infrastructure -<<<<<<< HEAD -I: tests -======= I: tests ->>>>>>> d84661c... tests: refactor VppDiedError. M: Klement Sekera <ksekera@cisco.com> M: Paul Vinciguerra <pvinci@vinciconsulting.com> F: test/ |