tests: fix the MAINTAINERS file

Undo the change from I8488ab318a596c9b737308829cedfb7e96e57302 to the MAINTAINERS file

Change-Id: Ieea4a59dad127c2f2dcd86a6a0c699c23fb9158d
Type: fix
Fixes: d84661c
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index bb62ca3..20f68f1 100644 (file)
--- 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/