remove conflicts

* no need for voting members as this comes from data Signed-off-by: Toshaan Bharvani <toshaan@vantosh.com>
3 years ago · 22ceab830d
parent 79176a2b29
commit 22ceab830d
1 changed files with 0 additions and 14 deletions
--- a/content/groups/compliance.md
+++ b/content/groups/compliance.md
@ -4,21 +4,7 @@ wgtype: twg
 image: thumb-2.jpg
 chair:
  - sandywoodward
-<<<<<<< HEAD
 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
 ---