From 79176a2b293369601ae7116dd7720b33a2fef1b7 Mon Sep 17 00:00:00 2001
From: Toshaan Bharvani <toshaan@vantosh.com>
Date: Thu, 10 Mar 2022 02:09:14 +0100
Subject: [PATCH] Update 'content/groups/compliance.md'

Signed-off-by: Toshaan Bharvani <toshaan@vantosh.com>
---
 content/groups/compliance.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/content/groups/compliance.md b/content/groups/compliance.md
index 64ff31a..32c86a0 100644
--- 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
 ---