commit 94477f63d6f46cd159ea9a971689956b1a173152
author Akron <nils@diewald-online.de> Thu Jul 19 12:18:40 2018 +0200
committer Akron <nils@diewald-online.de> Thu Jul 19 12:18:40 2018 +0200
tree ccb917b38072543d584f57db75bdb79122e6df55
parent 10a4796136d000df7546ce7149f14d57d8658155

Fix merge artifacts

Change-Id: I146308fe73173c8dd26c61e4300b0d28575e3048

Gruntfile.js

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']);