github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ns-alternative-test-env

Browse Source
This commit is contained in:
Nathan Sobo
2015-10-15 16:37:08 -06:00
parent 93fe0208a5 eddf2bd2da
commit 82c2323feb
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@@ -103,8 +103,13 @@
"open-on-github": "0.38.0",
"package-generator": "0.40.0",
"release-notes": "0.53.0",
<<<<<<< HEAD
"settings-view": "0.230.0",
"snippets": "0.101.0",
=======
"settings-view": "0.230.1",
"snippets": "0.100.0",
>>>>>>> origin/master
"spell-check": "0.61.0",
"status-bar": "0.79.0",
"styleguide": "0.44.0",