File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -167,10 +167,10 @@ and 2.7.
167167Once you have code, documentation and tests ready, it is time to finalize
168168the pull request.
169169
170- ### AUTHORS.txt
170+ ### CHANGES.rst
171171If you have done any non-trivial change and would like to be credited,
172172add yourself to
173- [ AUTHORS.txt ] ( https://github.com/robotframework/Selenium2Library/blob/master/AUTHORS.txt )
173+ [ CHANGES.rst ] ( https://github.com/robotframework/Selenium2Library/blob/master/CHANGES.rst )
174174file.
175175
176176### Resolving conflicts
@@ -181,7 +181,7 @@ same code as your changes. In that case you should
181181to allow for an easy merge.
182182
183183The most common conflicting file is the aforementioned
184- [ AUTHORS.txt ] ( https://github.com/robotframework/Selenium2Library/blob/master/AUTHORS.txt )
184+ [ CHANGES.rst ] ( https://github.com/robotframework/Selenium2Library/blob/master/CHANGES.rst )
185185, but luckily fixing those conflicts is typically easy.
186186
187187### Squashing commits
You can’t perform that action at this time.
0 commit comments