Merge branch 'master' of github.com:sapegin/dotfiles
Conflicts: sublime/User/Package Control.sublime-settings sublime/User/Preferences.sublime-settings
This commit is contained in:
@ -1,6 +1,7 @@
|
||||
{
|
||||
"auto_complete_delay": 1000,
|
||||
"auto_match_enabled": false,
|
||||
"caret_style": "phase",
|
||||
"color_scheme": "Packages/User/Tomorrow.tmTheme",
|
||||
"create_window_at_startup": false,
|
||||
"default_line_ending": "unix",
|
||||
|
Reference in New Issue
Block a user