Resolved merge conflicts.

This commit is contained in:
William Welling
2016-12-02 08:02:08 -06:00
9 changed files with 82 additions and 13 deletions

View File

@@ -14,11 +14,16 @@ export var commonPlugins = [
}
),
// Copy fonts
new CopyWebpackPlugin([{
from: path.join(__dirname, 'node_modules', 'font-awesome', 'fonts'),
to: path.join('assets', 'fonts')
}]),
// Copy fonts and i18n
new CopyWebpackPlugin([
{
from: path.join(__dirname, 'node_modules', 'font-awesome', 'fonts'),
to: path.join('assets', 'fonts')
}, {
from: path.join(__dirname, 'resources', 'i18n'),
to: path.join('assets', 'i18n')
}
]),
// Loader options
new webpack.LoaderOptionsPlugin({