aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Catalyst
diff options
context:
space:
mode:
authoromega <omega@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7>2008-06-22 18:50:25 +0000
committeromega <omega@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7>2008-06-22 18:50:25 +0000
commit888532d3340836e468a5572c44893f58e0202ed5 (patch)
treeefba09fcb270fd7c02712c9be12c8ee671500f34 /lib/Catalyst
parent6f51eb8562a023cd9ddf6a2ad09f0f416673b079 (diff)
downloadreaction-888532d3340836e468a5572c44893f58e0202ed5.tar.gz
reaction-888532d3340836e468a5572c44893f58e0202ed5.zip
fix some merge problems
Diffstat (limited to 'lib/Catalyst')
-rw-r--r--lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm b/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm
index e0abf71..4c6534f 100644
--- a/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm
+++ b/lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm
@@ -34,7 +34,6 @@ class DBIC, is 'Reaction::Object', is 'Catalyst::Component', which {
my $params = $cfg{db_params} || {};
my $schema = $schema_class
->connect($cfg{db_dsn}, $cfg{db_user}, $cfg{db_password}, $params);
-
return $class->new(_schema => $schema, _im_class => $im_class);
};