From e2a690c982005240b5bf3eb7aa9d8793dad7ea91 Mon Sep 17 00:00:00 2001 From: Tatu Aalto Date: Mon, 8 Aug 2016 18:19:01 +0300 Subject: [PATCH] Changed AUTHORS.txt to CHANGES.rst in CONTRIBUTING.md --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 265c5a3c0..37c51785f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -167,10 +167,10 @@ and 2.7. Once you have code, documentation and tests ready, it is time to finalize the pull request. -### AUTHORS.txt +### CHANGES.rst If you have done any non-trivial change and would like to be credited, add yourself to -[AUTHORS.txt](https://github.com/robotframework/Selenium2Library/blob/master/AUTHORS.txt) +[CHANGES.rst](https://github.com/robotframework/Selenium2Library/blob/master/CHANGES.rst) file. ### Resolving conflicts @@ -181,7 +181,7 @@ same code as your changes. In that case you should to allow for an easy merge. The most common conflicting file is the aforementioned -[AUTHORS.txt](https://github.com/robotframework/Selenium2Library/blob/master/AUTHORS.txt) +[CHANGES.rst](https://github.com/robotframework/Selenium2Library/blob/master/CHANGES.rst) , but luckily fixing those conflicts is typically easy. ### Squashing commits