From 718956450fbe272176172b661f87f578e1187695 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 21 Jan 2016 12:02:15 -0500 Subject: [PATCH] Credit the contributor's covenant as well --- conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct.md b/conduct.md index f9d0c3d87..ab0f3e7d3 100644 --- a/conduct.md +++ b/conduct.md @@ -35,4 +35,4 @@ In the Rust community we strive to go the extra step to look out for each other. And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could've communicated better — remember that it's your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust. -*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)* +*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/).*