mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-17 15:03:07 +00:00
Resolved merge conflicts.
This commit is contained in:
@@ -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({
|
||||
|
Reference in New Issue
Block a user