From bb3f292f5fcbf967059d881320cbbecccfa323f0 Mon Sep 17 00:00:00 2001
From: Gene Hoffman <30377676+hoffmang9@users.noreply.github.com>
Date: Mon, 14 Sep 2020 17:45:48 -0700
Subject: [PATCH] Bram's edit to code_of_conduct and start new dev branch

---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 5474342729..8998906234 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -24,7 +24,7 @@ Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
  advances
-* Excessive trolling, insulting/derogatory comments, and personal or political attacks
+* Insulting/derogatory comments, and personal or political attacks, or excessive trolling.
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
  address, without explicit permission