From bc59ea0d55320e2f69db7b8009febbe2e68d4416 Mon Sep 17 00:00:00 2001 From: anandbaburajan Date: Tue, 14 Feb 2023 18:33:01 +0530 Subject: [PATCH 1/2] chore: add anand to asset's codeowner (cherry picked from commit d003370f61ef405bd69932005a1c02d35fe947ee) # Conflicts: # CODEOWNERS --- CODEOWNERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 6e751cc9aa6..9928f9c983a 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -4,8 +4,12 @@ # the repo. Unless a later match takes precedence, erpnext/accounts/ @nextchamp-saqib @deepeshgarg007 @ruthra-kumar +<<<<<<< HEAD erpnext/assets/ @nextchamp-saqib @deepeshgarg007 @ruthra-kumar erpnext/erpnext_integrations/ @nextchamp-saqib +======= +erpnext/assets/ @anandbaburajan @deepeshgarg007 +>>>>>>> d003370f61 (chore: add anand to asset's codeowner) erpnext/loan_management/ @nextchamp-saqib @deepeshgarg007 erpnext/regional @nextchamp-saqib @deepeshgarg007 @ruthra-kumar erpnext/selling @nextchamp-saqib @deepeshgarg007 @ruthra-kumar From 1223e31e7da79fe2afd8505b08734a139bdb91f2 Mon Sep 17 00:00:00 2001 From: Anand Baburajan Date: Tue, 14 Feb 2023 20:33:40 +0530 Subject: [PATCH 2/2] Update CODEOWNERS --- CODEOWNERS | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 9928f9c983a..77761dd14e2 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -4,12 +4,8 @@ # the repo. Unless a later match takes precedence, erpnext/accounts/ @nextchamp-saqib @deepeshgarg007 @ruthra-kumar -<<<<<<< HEAD -erpnext/assets/ @nextchamp-saqib @deepeshgarg007 @ruthra-kumar -erpnext/erpnext_integrations/ @nextchamp-saqib -======= erpnext/assets/ @anandbaburajan @deepeshgarg007 ->>>>>>> d003370f61 (chore: add anand to asset's codeowner) +erpnext/erpnext_integrations/ @nextchamp-saqib erpnext/loan_management/ @nextchamp-saqib @deepeshgarg007 erpnext/regional @nextchamp-saqib @deepeshgarg007 @ruthra-kumar erpnext/selling @nextchamp-saqib @deepeshgarg007 @ruthra-kumar