🔥 broken test case from merge

Merge pull request atom#19207 from atom/aw/versioned-application-state

Only store directories in serialized application state

Merge pull request atom#19136 from atom/aw/open-file-regression

"Open file" in existing window

Merge pull request atom#19136 from atom/aw/open-file-regression

"Open file" in existing window

Merge pull request atom#18984 from atom/aw/respect-test-packages

Ensure APM_TEST_PACKAGES may be activated in Jasmine specs

Merge pull request atom#18855 from atom/dw-fix-open-folder

Fix "Open Folder" menu item on Windows

Merge pull request atom#18855 from atom/dw-fix-open-folder

Fix "Open Folder" menu item on Windows

attempt to fix travis build

hand resolved a merge conflict in package.json, but travis build was complaining.  I think because the lockfile is out of sync with package.json.

Merge pull request atom#18961 from atom/settings-view-0.260.1

⬆️ settings-view@0.260.1

1.35.0-beta0