Fix merge conflict in user.html
[mediagoblin.git] / mediagoblin / static / css /
drwxr-xr-x   ..
-rw-r--r-- 4771 base.css
drwxr-xr-x - contrib