resolve merge conflict

diff --combined META.yml
index db6bcbcb5bb5ffb9134794b082214b7089fe6c7e,510f9d67e8d4999e60a2c10a8d2f93fe565601da..cc7fdf4724386f7a497bbfbba7f8cdcd6f6bf2f5
--- 1/META.yml
--- 2/META.yml
+++ b/META.yml
@@@ -1,16 -1,28 +1,28 @@@
  --- #YAML:1.0
 -name:               DBIx-Class-ResultSet-RecursiveUpdate
 -version:            v0.008
 -abstract:           like update_or_create - but recursive
 -author:
 +name:                DBIx-Class-ResultSet-RecursiveUpdate
 +version:             0.0.9
 +abstract:            like update_or_create - but recursive 
- license:             ~
 +author:              
      - Zbigniew Lukasiak <zby@cpan.org>
- generated_by:        ExtUtils::MakeMaker version 6.40
- distribution_type:   module
- requires:     
-     DBIx::Class:                   0
-     Test::More:                    0
-     version:                       0
+ license:            perl
+ distribution_type:  module
+ configure_requires:
+     ExtUtils::MakeMaker:  0
+ build_requires:
+     ExtUtils::MakeMaker:  0
+ requires:
+     DateTime:             0
+     DBD::SQLite:          1.21
+     DBIx::Class:          0.08100
+     DBIx::Class::IntrospectableM2M:  0
+     SQL::Translator:      0.09004
+     Test::More:           0
+     version:              0
+ no_index:
+     directory:
+         - t
+         - inc
+ generated_by:       ExtUtils::MakeMaker version 6.50
  meta-spec:
-     url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-     version: 1.3
+     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+     version:  1.4