resolve conflict

Author: jindrichskupa

CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.0.3
+
+- Change to DARV BAS registry (with support of legal form)

README.md

@@ -54,13 +54,16 @@ ruby-ares will raise either `RubyARES::Parser::ARESDatabaseError` or `RubyARES::
 
 If the connection to the ARES database can't be established ruby-ares raises `RubyARES::HTTP::ConnectionError`.
 
-## Changelog
+## License
 
-### 1.0.0
+ruby-ares is written and maintained by [Josef Strzibny](http://strzibny.name).
 
-* added ARES legal form id
-* added support for case reference
+See LICENSE file.
 
-## License
+## Contributors
+
+Contributions are welcome!
+
+Here are the list of current contributors:
 
-See LICENSE
+- Jindřich Skupa

lib/ruby-ares.rb

@@ -9,5 +9,5 @@
 require 'ruby-ares/parser'
 
 module RubyARES
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

ruby-ares.gemspec

@@ -20,8 +20,8 @@ gemspec = Gem::Specification.new do |s|
   s.homepage = 'http://github.com/strzibny/ruby-ares'
   s.required_ruby_version     = '>= 1.8.7'
   s.required_rubygems_version = '>= 1.8.0'
-  s.files = FileList['README.md', 'Rakefile',
-                      'lib/**/*.rb', 'test/**/test*.rb']
+  s.files = FileList['README.md', 'Rakefile', 'CHANGELOG.md',
+                     'lib/**/*.rb', 'test/**/test*.rb']
   s.add_runtime_dependency 'libxml-ruby'
   s.requirements << 'libxml2'
 end