Fix merge conflicts
[mediagoblin.git] / mediagoblin / static / css / extlib / reset.css
1 ../../../../extlib/reset/reset.css