Update release_process.md

2021-01-23 14:10:35 +01:00 · 2021-01-23 14:10:35 +01:00 · 78a85ebd30
parent d1de9547e0
commit 78a85ebd30
1 changed files with 2 additions and 5 deletions
--- a/docs/release_process.md
+++ b/docs/release_process.md
@ -5,12 +5,9 @@
 To release a new version of Ransack and publish it to RubyGems, take the following steps:

 - Create a new release, marked `Prerelease`.
-<<<<<<< Updated upstream
 - Update the versions file to the new release, commit and push to `master`.
-=======
- Update the [version.rb](../lib/ransack/version.rb) file to the new release, commit and push to `master`.
->>>>>>> Stashed changes
- From the terminal, run the following commands
+- Update the [`version.rb`](../lib/ransack/version.rb) file to the new release, commit and push to `master`.
+- From the terminal, run the following commands:

 ```bash
 rake build