Permalink
Browse files

Changed AUTHORS.txt to CHANGES.rst in CONTRIBUTING.md

  • Loading branch information...
1 parent e96af7a commit e2a690c982005240b5bf3eb7aa9d8793dad7ea91 @aaltat aaltat committed Aug 8, 2016
Showing with 3 additions and 3 deletions.
  1. +3 −3 CONTRIBUTING.md
View
@@ -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

0 comments on commit e2a690c

Please sign in to comment.