fixed conflict
authorJohan Sørensen <johan@johansorensen.com>
Fri, 11 Jan 2008 21:58:13 +0000 (22:58 +0100)
committerJohan Sørensen <johan@johansorensen.com>
Fri, 11 Jan 2008 21:58:13 +0000 (22:58 +0100)
commit07e3b2ab5a86710939f0d9f1f12d861842360c2e
tree7c51d9f1a1b29183209d291fcf5c658e6a4b79a1
parentd2f9f71b65c7e33a2d67a3d678824ba4ebd7794c
fixed conflict
config/initializers/requires.rb