aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1943c0f9f6f..bb62ca32424 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -332,7 +332,11 @@ 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/