projects
/
gitmo/Moose.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(parent:
8b9641b
)
Also conflict on Fey::ORM
Dave Rolsky [Sun, 26 Sep 2010 19:15:08 +0000 (14:15 -0500)]
Makefile.PL
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.PL
b/Makefile.PL
index
7349591
..
228f9fe
100644
(file)
--- a/
Makefile.PL
+++ b/
Makefile.PL
@@
-71,7
+71,7
@@
sub check_conflicts {
'Catalyst' => '5.80017',
'Devel::REPL' => '1.003008',
'Fey' => '0.36',
- 'Fey::ORM' => '0.23',
+ 'Fey::ORM' => '0.34',
'File::ChangeNotify' => '0.15',
'KiokuDB' => '0.41',
'MooseX::Aliases' => '0.07',