From 74050b47c5e1d7dcc50b17ded62d696bcd8fe2a6 Mon Sep 17 00:00:00 2001
From: Barry Pollard <barrypollard@google.com>
Date: Sun, 10 Nov 2024 00:20:45 +0000
Subject: [PATCH] Fix config

---
 src/config/contributors.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/config/contributors.json b/src/config/contributors.json
index de937b08276..234bc99d2bd 100644
--- a/src/config/contributors.json
+++ b/src/config/contributors.json
@@ -977,20 +977,13 @@
     "website": "https://chrisadams.me.uk"
   },
   "ChrisBeeti": {
-<<<<<<< HEAD
     "avatar_url": "32492572",
     "github": "ChrisBeeti",
     "name": "Christian Böttger",
     "teams": {
       "2024": [
+        "leads",
         "reviewers"
-=======
-    "github": "ChrisBeeti",
-    "name": "Chris Beeti",
-    "teams": {
-      "2024": [
-        "leads"
->>>>>>> main
       ]
     }
   },