From 4b93d53e5d25b8a4a830646b9e6fec48db69ce9c Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Wed, 26 Feb 2014 22:42:20 -0500 Subject: fix merge debris --- code-of-conduct.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code-of-conduct.txt b/code-of-conduct.txt index 9eb5a2d..f238478 100644 --- a/code-of-conduct.txt +++ b/code-of-conduct.txt @@ -75,12 +75,6 @@ someone from making a dangerous mistake, you may wish to consider finding a different way to say it. Remember, people don't remember what you tell them, they remember how you make them feel. -While "Well, actually" may be appropriate when conveying a major -correction or preventing someone from making a dangerous mistake, you -may wish to consider finding a different way to say it. In short: -"People don't remember what you tell them, they remember how you make -them feel."[1] - If you overhear people working through a problem, avoid intermittently lobbing advice across the room. This can lead to the "too many cooks" problem, but more importantly, it can be rude and disruptive -- cgit v1.2.3