You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@community.apache.org by rl...@apache.org on 2023/04/29 08:51:59 UTC
[comdev-site] branch main updated: Remove merge conflict comment
This is an automated email from the ASF dual-hosted git repository.
rlenferink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/comdev-site.git
The following commit(s) were added to refs/heads/main by this push:
new 69032b7 Remove merge conflict comment
69032b7 is described below
commit 69032b713f4b333fcd4b1d849fb5cf8690e1992c
Author: Roy Lenferink <le...@gmail.com>
AuthorDate: Sat Apr 29 10:51:52 2023 +0200
Remove merge conflict comment
---
source/pmc/new-member.md | 2 --
1 file changed, 2 deletions(-)
diff --git a/source/pmc/new-member.md b/source/pmc/new-member.md
index dcfda03..f71714b 100644
--- a/source/pmc/new-member.md
+++ b/source/pmc/new-member.md
@@ -6,8 +6,6 @@ tags: ["pmc","election"]
You've been invited to join a project PMC? Congratulations! What should
you do now?
-<<<<<<< HEAD
-=======
Being part of an ASF Project Management Committee is more than just an
acknowledgement of your contributions. It's a new level of
responsibility for the project's health and sustainability. The Board of