Update 'content/groups/compliance.md'

Signed-off-by: Toshaan Bharvani <toshaan@vantosh.com>
3 years ago · 79176a2b29
parent 88ee183e7c
commit 79176a2b29
1 changed files with 14 additions and 0 deletions
--- a/content/groups/compliance.md
+++ b/content/groups/compliance.md
@ -4,7 +4,21 @@ 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
 ---