Fix merge conflict [skip ci]

This commit is contained in:
Jon Atack 2014-12-18 00:05:07 +01:00
parent 777b2499a2
commit e98385837e
1 changed files with 1 additions and 5 deletions

View File

@ -25,7 +25,7 @@ for that matter). Try [Squeel](https://github.com/activerecord-hackery/squeel)
instead.
If you're viewing this at
[https://github.com/activerecord-hackery/ransack](https://github.com/activerecord-hackery/ransack),
[github.com/activerecord-hackery/ransack](https://github.com/activerecord-hackery/ransack),
you're reading the documentation for the master branch with the latest features.
[View documentation for the last release (1.5.1).](https://github.com/activerecord-hackery/ransack/tree/v.1.5.1)
@ -36,10 +36,6 @@ We try to keep it functioning with Rails master as well. Ransack works
out-of-the-box with Active Record and features new support for Mongoid 4.0
(without associations, further details below). If you are on Ruby 1.8, you may
need to use a slightly earlier version of Ransack, like '< 1.4'.
=======
Ransack is compatible with Ruby on Rails 3 and 4 running on Ruby 1.9 and later.
Ransack works out-of-the box with Active Record and features new support for
Mongoid 4.0 (without associations, further details below).
In your Gemfile, for the last officially released Ransack gem: