⬆️ apm

---

Re-applying this commit because it was accidentally merged from stable into
beta and master with `--strategy ours` (discard all changes) instead of
`-X ours` (discard conflicting changes).
This commit is contained in:
Nathan Sobo 2015-09-18 14:56:42 -06:00 committed by Max Brunsfeld
parent ccfa36d1b1
commit 15686c25fd

View File

@ -6,6 +6,6 @@
"url": "https://github.com/atom/atom.git"
},
"dependencies": {
"atom-package-manager": "1.0.4"
"atom-package-manager": "1.0.5"
}
}