remove conflicts

* no need for voting members as this comes from data

Signed-off-by: Toshaan Bharvani <toshaan@vantosh.com>
remotes/1690132257852795115/master
Toshaan Bharvani 3 years ago
parent 79176a2b29
commit 22ceab830d

@ -4,21 +4,7 @@ wgtype: twg
image: thumb-2.jpg image: thumb-2.jpg
chair: chair:
- sandywoodward - sandywoodward
<<<<<<< HEAD
date: 2021-03-15 date: 2021-03-15
||||||| parent of 8749573 (Update 'content/groups/compliance.md')
members:
- ibm
- yadro
- vantosh
date: 2022-01-25
=======
members:
- ibm
- yadro
- vantosh
date: 2022-03-08
>>>>>>> 8749573 (Update 'content/groups/compliance.md')
draft: false draft: false
--- ---



Loading…
Cancel
Save