Make git merge work by committing db/seeds.rb
authorMarius Mathiesen <marius@gitorious.com>
Fri, 12 Jul 2013 10:51:48 +0000 (12:51 +0200)
committerMarius Mathiesen <marius@gitorious.com>
Fri, 12 Jul 2013 10:51:48 +0000 (12:51 +0200)
commited4c6c50e6a1148be9be99de02a9695db7683e20
tree4243a9f5747dd0dc351dc3592e9881ac61254ac1
parentf8ac490648e51d417bb3f68a2ee2a7784ed0f088
Make git merge work by committing db/seeds.rb
modules/gitorious/manifests/templates.pp