File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3030 diff-lcs (1.1.2 )
3131 extlib (0.9.15 )
3232 factory_girl (1.3.2 )
33+ factory_girl (1.3.1 )
34+ factory_girl (1.3.2 )
3335 ffi (0.6.3 )
3436 rake (>= 0.8.7 )
3537 gherkin (2.1.5 )
3638 trollop (~> 1.16.2 )
3739 haml (3.0.18 )
40+ haml (3.0.18 )
3841 highline (1.6.1 )
3942 i18n (0.4.1 )
4043 jnunemaker-validatable (1.8.4 )
4649 mime-types (1.16 )
4750 mongo (1.0.8 )
4851 bson (>= 1.0.5 )
52+ <<<<<<< HEAD
53+ mongo_mapper (0.8.4 )
54+ activesupport (>= 2.3.4 )
55+ jnunemaker-validatable (~> 1.8.4 )
56+ plucky (~> 0.3.5 )
57+ =======
58+ <<<<<<< HEAD
59+ mongo_mapper (0.8.2 )
60+ activesupport (>= 2.3.4 )
61+ jnunemaker-validatable (~> 1.8.4 )
62+ plucky (~> 0.3.1 )
63+ =======
4964 mongo_mapper (0.8.4 )
5065 activesupport (>= 2.3.4 )
5166 jnunemaker-validatable (~> 1.8.4 )
5267 plucky (~> 0.3.5 )
68+ >>>>>>> updating gems and the Gemfile.lock
69+ >>>>>>> updating gems and the Gemfile.lock
5370 nokogiri (1.4.3.1 )
5471 plucky (0.3.5 )
5572 mongo (~> 1.0.8 )
You can’t perform that action at this time.
0 commit comments