fix problematic merge
authorRichard Fairhurst <richard@systemed.net>
Sat, 7 Jul 2007 13:26:17 +0000 (13:26 +0000)
committerRichard Fairhurst <richard@systemed.net>
Sat, 7 Jul 2007 13:26:17 +0000 (13:26 +0000)
commit84b67e00a07262139f2cc9e9460f4afd35e91349
tree63511a29f6a462208af63bd00741eb9705adabad
parent55d8bc5256606d3922116cc5ae64330378533301
fix problematic merge
app/controllers/amf_controller.rb
public/potlatch/potlatch.swf