mirror of
https://github.com/atom/atom.git
synced 2026-01-24 06:18:03 -05:00
Merge remote-tracking branch 'origin/stable' into beta
Conflicts: package.json
This commit is contained in:
@@ -55,7 +55,7 @@ class Project extends Model
|
||||
###
|
||||
|
||||
deserialize: (state, deserializerManager) ->
|
||||
states.paths = [state.path] if state.path? # backward compatibility
|
||||
state.paths = [state.path] if state.path? # backward compatibility
|
||||
|
||||
@buffers = _.compact state.buffers.map (bufferState) ->
|
||||
# Check that buffer's file path is accessible
|
||||
|
||||
Reference in New Issue
Block a user