Fix merge artifacts
Change-Id: I146308fe73173c8dd26c61e4300b0d28575e3048
diff --git a/Gruntfile.js b/Gruntfile.js
index 2f7bb0d..f301893 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -25,7 +25,7 @@
var reqTasks = [];
var uglyFiles = {
'public/js/korap-plugin-<%= pkg.pluginVersion %>.js': ['dev/js/src/plugin/client.js']
- },
+ };
for (var i in {'en' : 0, 'de' : 1}) {
@@ -157,7 +157,6 @@
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-uglify-es');
grunt.loadNpmTasks('grunt-contrib-requirejs');
- grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.registerTask('img', ['imagemin','copy']);
grunt.registerTask('js', ['requirejs']);
grunt.registerTask('css', ['sass']);
diff --git a/package.json b/package.json
index 69de7f6..ed705b1 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,6 @@
"description": "Mojolicious-based Frontend for KorAP",
"license": "BSD-2-Clause",
"version": "0.27.4",
- "repository": {
"pluginVersion": "0.1",
"repository" : {
"type": "git",
@@ -20,7 +19,5 @@
"imagemin": "^5.3.1",
"optipng-bin": "^4.0.0",
"vinyl-fs": "^3.0.2"
- "optipng-bin": "^4.0.0",
- "grunt-contrib-uglify": "^3.3.0"
}
}