oops. left a little bit of diff goodness in there. fixed

diff --git a/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm b/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm
index 98618b8..019a185 100644 (file)
--- a/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm
+++ b/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm
@@ -4,11 +4,8 @@ use strict;
 use warnings;
 use base qw/Class::Accessor::Fast/;
 
-<<<<<<< .mine
 our $VERSION= "0.10";
-=======
-our $VERSION= "0.03";
->>>>>>> .r6516
+
 
 BEGIN {
     __PACKAGE__->mk_accessors(qw/config/);