github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix busted merge

Browse Source
This commit is contained in:
Nathan Sobo
2015-10-15 16:45:29 -06:00
parent 670f200b52
commit e6a494cfdb
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@@ -103,13 +103,8 @@
"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
"snippets": "0.101.0",
"spell-check": "0.61.0",
"status-bar": "0.79.0",
"styleguide": "0.44.0",