Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Installed Packages/Package Control.sublime-package
This commit is contained in:
Alexander Anpleenko committed 2017-10-13 20:42:13 +03:00
commit 07d863e021
4 files changed
+19 -4

No files matched your search

@@ -0,0 +1,5 @@
[
// Multiple Cursors
{ "keys": ["ctrl+up"], "command": "select_lines", "args": {"forward": false} },
{ "keys": ["ctrl+down"], "command": "select_lines", "args": {"forward": true} },
]
@@ -44,6 +44,7 @@
"HTML Head Snippets",
"Inc-Dec-Value",
"Increment Selection",
"Inspired GitHub Color Scheme",
"Jade",
"JavaScript Snippets",
"Jekyll",
@@ -66,7 +67,6 @@
"Pug",
"Random Everything",
"React ES6 Snippets",
"ReactJS",
"SideBarEnhancements",
"Stylus",
"SublimeCodeIntel",
+2 -3
View File
@@ -6,7 +6,7 @@
"caret_extra_top": 3,
"caret_extra_width": 2,
"close_windows_when_empty": false,
"color_scheme": "Packages/Color Scheme - Default/Dawn.tmTheme",
"color_scheme": "Packages/Color Scheme - Default/Mariana.tmTheme",
"color_scheme_option": 0,
"drag_text": false,
"draw_centered": true,
@@ -93,9 +93,8 @@
"show_full_path": true,
"sidebar_small": true,
"soda_folder_icons": true,
"spacegray_sidebar_font_large": true,
"tabs_small": true,
"theme": "Soda Light 3.sublime-theme",
"theme": "Soda Dark 3.sublime-theme",
"trailing_spaces_trim_on_save": true,
"translate_tabs_to_spaces": true,
"trim_automatic_white_space": true,
@@ -0,0 +1,11 @@
<snippet>
<content><![CDATA[
try {
${1:}
} catch (error) {
${2:}
}
]]></content>
<tabTrigger>try</tabTrigger>
<scope>source.js, source.es</scope>
</snippet>