fix some merge problems
authoromega <omega@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7>
Sun, 22 Jun 2008 18:50:25 +0000 (18:50 +0000)
committeromega <omega@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7>
Sun, 22 Jun 2008 18:50:25 +0000 (18:50 +0000)
commit888532d3340836e468a5572c44893f58e0202ed5
treeefba09fcb270fd7c02712c9be12c8ee671500f34
parent6f51eb8562a023cd9ddf6a2ad09f0f416673b079
fix some merge problems
lib/Catalyst/Model/Reaction/InterfaceModel/DBIC.pm
lib/Reaction/InterfaceModel/Reflector/DBIC.pm
lib/Reaction/Manual/Intro.pod
lib/Reaction/UI/Skin.pm