Bumping to RC [ci-skip]

countries · Sep 19, 2016 · a79bd47 · a79bd47
1 parent 94a7c4c
commit a79bd47
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.0.rc
+- Various Content Updates
+
 ## 2.0.0.pre.4
 - Fix crash when app introduces an unexpected locale. Much thanks to @jstenhouse
 

diff --git a/README.markdown b/README.markdown
@@ -184,6 +184,8 @@ c.in_eu? #=> false
 Currencies
 ----------
 
+**WARNING** if you have a top level class named `Money` you will conflict with this gem.  If this is a large issue we will add a feature to turn currency features off.
+
 Countries now uses the [Money](https://github.com/RubyMoney/money) gem. What this means is you now get back a Money::Currency object that gives you access to all the currency information.
 
 ``` ruby
@@ -217,7 +219,7 @@ ISO3166::Data.register(
   }
 )
 
-ISO3166::Country.new('LOL').name = 'Happy Country'
+ISO3166::Country.new('LOL').name == 'Happy Country'
 ```
 
 Mongoid