Merge branch 'master' of https://github.com/pemulis/openlibrary-wrapper…

… into pemulis-master * 'master' of https://github.com/pemulis/openlibrary-wrapper: add license information Conflicts: README.rdoc
jayfajardo · Jul 16, 2013 · fbe7ed8 · fbe7ed8
2 parents ea3117a + 3e3db18
commit fbe7ed8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -200,5 +200,12 @@ Other built-in finder methods:
 * Eric Larson https://github.com/ewlarson
 * Charles Horn https://github.com/hornc
 * Alex Grant https://github.com/grantovich
+<<<<<<< HEAD
 * Bryan L. Fordham https://github.com/bfordham
 * Kyle Corbitt https://github.com/kcorbitt
+=======
+
+== LICENSE
+
+This code is released under the {CC0 License}[http://creativecommons.org/publicdomain/zero/1.0/], and may be used for any purpose without restrictions.
+>>>>>>> 3e3db18144f8faad94b5c0353424e4207a795c88