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

# Conflicts: # package.json # yarn.lock
fisker · Dec 17, 2018 · f99c786 · f99c786
2 parents ac7db60 + c554575
commit f99c786
Show file tree

Hide file tree

Showing 3 changed files with 625 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # imagemin-upng
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/fisker/imagemin-upng.svg)](https://greenkeeper.io/)
+
 > upng imagemin plugin
 >
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)

diff --git a/package.json b/package.json
@@ -39,10 +39,18 @@
   },
   "devDependencies": {
     "ava": "0.25.0",
+<<<<<<< .mine
     "eslint": "^5.7.0",
     "eslint-plugin-prettier": "^3.0.0",
     "np": "^3.0.4",
     "prettier": "^1.14.3",
     "semantic-release": "^15.10.5"
+=======
+    "eslint": "^5.7.0",
+    "eslint-plugin-prettier": "^3.0.0",
+    "prettier": "^1.12.1"
+
+
+>>>>>>> .theirs
   }
 }