summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorAndrew Yourtchenko <ayourtch@gmail.com>2019-06-24 16:26:24 +0000
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2019-06-24 17:52:25 +0000
commit9d97d014119988a26131dee1d148d3265539f9cc (patch)
tree5795778159b847effb04536c74bbb417ef4f98a1 /MAINTAINERS
parenta638c18375f17891a9455e717d8436158af12387 (diff)
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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
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/