Skip to content

Commit

Permalink
⬆️ apm
Browse files Browse the repository at this point in the history
---

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).
  • Loading branch information
Nathan Sobo authored and maxbrunsfeld committed Sep 18, 2015
1 parent ccfa36d commit 15686c2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion apm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"url": "https://github.com/atom/atom.git"
},
"dependencies": {
"atom-package-manager": "1.0.4"
"atom-package-manager": "1.0.5"
}
}

0 comments on commit 15686c2

Please sign in to comment.