[Catalyst-commits] r6518 - trunk/Catalyst-Plugin-Authentication-Store-DBIx-Class/lib/Catalyst/Plugin/Authentication/Store/DBIx

[jayk at dev.catalyst.perl.org]

Author: jayk
Date: 2007-07-08 04:45:21 +0100 (Sun, 08 Jul 2007)
New Revision: 6518

Modified:
   trunk/Catalyst-Plugin-Authentication-Store-DBIx-Class/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm
Log:
oops. left a little bit of diff goodness in there. fixed


Modified: trunk/Catalyst-Plugin-Authentication-Store-DBIx-Class/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm
===================================================================
--- trunk/Catalyst-Plugin-Authentication-Store-DBIx-Class/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm	2007-07-08 03:41:34 UTC (rev 6517)
+++ trunk/Catalyst-Plugin-Authentication-Store-DBIx-Class/lib/Catalyst/Plugin/Authentication/Store/DBIx/Class.pm	2007-07-08 03:45:21 UTC (rev 6518)
@@ -4,12 +4,9 @@
 use warnings;
 use base qw/Class::Accessor::Fast/;
 
-<<<<<<< .mine
 our $VERSION= "0.10";
-=======
-our $VERSION= "0.03";
->>>>>>> .r6516
 
+
 BEGIN {
     __PACKAGE__->mk_accessors(qw/config/);
 }