Merge pull request #2 from orchid00/patch-1
authorErin Becker <erinstellabecker@gmail.com>
Tue, 20 Feb 2018 11:01:44 +0000 (13:01 +0200)
committerGitHub <noreply@github.com>
Tue, 20 Feb 2018 11:01:44 +0000 (13:01 +0200)
Update CONDUCT.md


Trivial merge