resolved user.rb conflict
[rails.git] / public / potlatch /
drwxr-xr-x   ..
-rwxr-xr-x 70790 potlatch.swf
-rwxr-xr-x 111393 ymap.swf