Conflicts: content-sample/index.md themes/default/font/fontello.eot themes/default/font/fontello.svg themes/default/font/fontello.ttf themes/default/font/fontello.woff themes/default/font/fontello.woff2 themes/default/fontello.css
Follow-up to b493ebdb84e0da20e73ee21992ff36868be0008f