Merge branch 'master' of github.com:fisker/imagemin-upng

# Conflicts: # package.json # yarn.lock
fisker · Feb 11, 2019 · 2e32503 · 2e32503
2 parents 8541b50 + a005e5e
commit 2e32503
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6,775 deletions.
diff --git a/package.json b/package.json
@@ -39,10 +39,10 @@
   },
   "devDependencies": {
     "ava": "1.2.1",
-    "eslint": "^5.13.0",
-    "eslint-plugin-prettier": "^3.0.1",
     "np": "^4.0.2",
     "prettier": "^1.16.4",
-    "semantic-release": "^15.13.3"
+    "semantic-release": "^15.13.3",
+    "eslint": "^5.13.0",
+    "eslint-plugin-prettier": "^3.0.1"
   }
 }