From 1caa29315279ac6cc8e77ee0db20b92cb680cb3f Mon Sep 17 00:00:00 2001
From: Se7en <469227928@qq.com>
Date: Mon, 28 Sep 2020 16:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!123=20:?=
 =?UTF-8?q?=20change'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repository/geregecaotest.yaml | 6 ------
 sig/Container/OWNERS          | 4 ----
 sig/DB/OWNERS                 | 1 +
 sig/Kernel/OWNERS             | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 repository/geregecaotest.yaml

diff --git a/repository/geregecaotest.yaml b/repository/geregecaotest.yaml
deleted file mode 100644
index 64cb004..0000000
--- a/repository/geregecaotest.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-- name: kubernetes
-  description: "kubernetes employ and operate"
-  protected_branches:
-  - master
-  type: public
\ No newline at end of file
diff --git a/sig/Container/OWNERS b/sig/Container/OWNERS
index caefccd..7b69e89 100644
--- a/sig/Container/OWNERS
+++ b/sig/Container/OWNERS
@@ -4,7 +4,3 @@ maintainers:
 - duguhaotian
 - jing-rui
 - flyflyflypeng
-<<<<<<< HEAD
-- liuqi469227928
-=======
->>>>>>> 366daf369b82e50ce273bc9b7223f0d525c4b705
diff --git a/sig/DB/OWNERS b/sig/DB/OWNERS
index 305a9a6..a12503c 100644
--- a/sig/DB/OWNERS
+++ b/sig/DB/OWNERS
@@ -3,3 +3,4 @@ maintainers:
 - miao_kaibo
 - jimmy_hero
 - zhuchunyi
+- liuqi469227928
diff --git a/sig/Kernel/OWNERS b/sig/Kernel/OWNERS
index 2738e6c..891200e 100644
--- a/sig/Kernel/OWNERS
+++ b/sig/Kernel/OWNERS
@@ -1,4 +1,4 @@
 maintainers:
 - weiyj_lk
 - xiexiuqi
-- yangyingliang
+- yangyingliang
\ No newline at end of file
-- 
Gitee