Resolve merge conflict

Author: code-warrior

tutorials/sublime-text/User/Preferences.sublime-settings

@@ -1,77 +1,76 @@
 {
-  "always_prompt_for_file_reload": true,
-  "always_show_minimap_viewport": true,
-  "auto_complete": false,
-  "auto_complete_cycle": true,
-  "auto_complete_with_fields": true,
-  "bold_folder_labels": true,
-  "caret_extra_bottom": 0,
-  "caret_extra_top": 0,
-  "caret_extra_width": 0,
-  "caret_style": "phase",
-  "close_windows_when_empty": true,
-  "copy_with_empty_selection": false,
-  "control_character_style": "names",
-  "create_window_at_startup": false,
-  "default_line_ending": "unix",
-  "detect_indentation": false,
-  "drag_text": false,
-  "draw_minimap_border": true,
-  "draw_unicode_white_space": "all",
-  "draw_white_space": "all",
-  "enable_telemetry": "false",
-  "ensure_newline_at_eof_on_save": true,
-  "fade_fold_buttons": false,
-  "find_selected_text": true,
-  "folder_exclude_patterns": [
-    ".idea",
-    ".sass-cache",
-    ".git",
-    ".Trash",
-    ".Trash-*"
-  ],
-  "font_face": "IBM Plex Mono",
-  "font_face": "Ubuntu Mono",
-  "font_options": [
-    "subpixel_antialias"
-   ],
-  "font_size": 16,
-  "highlight_modified_tabs": true,
-  "highlight_gutter": true,
-  "hot_exit": false,
-  "ignored_packages": [
-    "AutoFileName",
-    "Neon Color Scheme",
-    "SideBarGit",
-    "Tag",
-    "Vintage"
-  ],
-  "indent_guide_options": [
-    "draw_active"
-  ],
-  "indent_to_bracket": true,
-  "margin": 0,
-  "match_brackets_angle": true,
-  "move_to_limit_on_up_down": true,
-  "open_files_in_new_window": "always",
-  "remember_workspace": false,
-  "rulers": [
-    60, 72, 80, 85, 120
-  ],
-  "scroll_past_end": true,
-  "shift_tab_unindent": true,
-  "show_definitions": false,
-  "show_encoding": true,
-  "show_full_path": true,
-  "show_line_endings": true,
-  "smart_indent": false,
-  "spell_check": true,
-  "tab_completion": false,
-  "tab_size": 2,
-  "translate_tabs_to_spaces": true,
-  "trim_trailing_white_space_on_save": true,
-  "update_check": false,
-  "word_separators": "./\\()\"'_-–—“”‘”:,.;<>~!@#$%^&*|+=[]{}`~?",
-  "word_wrap": "true",
-  "wrap_width": 0
+	"always_prompt_for_file_reload": true,
+	"always_show_minimap_viewport": true,
+	"auto_complete": false,
+	"auto_complete_cycle": true,
+	"auto_complete_with_fields": true,
+	"bold_folder_labels": true,
+	"caret_extra_bottom": 0,
+	"caret_extra_top": 0,
+	"caret_extra_width": 0,
+	"caret_style": "phase",
+	"close_windows_when_empty": true,
+	"copy_with_empty_selection": false,
+	"control_character_style": "names",
+	"create_window_at_startup": false,
+	"default_line_ending": "unix",
+	"detect_indentation": false,
+	"drag_text": false,
+	"draw_minimap_border": true,
+	"draw_unicode_white_space": "all",
+	"draw_white_space": "all",
+	"enable_telemetry": "false",
+	"ensure_newline_at_eof_on_save": true,
+	"fade_fold_buttons": false,
+	"find_selected_text": true,
+	"folder_exclude_patterns": [
+		".idea",
+		".sass-cache",
+		".git",
+		".Trash",
+		".Trash-*"
+	],
+	"font_face": "IBM Plex Mono",
+	"font_options": [
+		"subpixel_antialias"
+	 ],
+	"font_size": 16,
+	"highlight_modified_tabs": true,
+	"highlight_gutter": true,
+	"hot_exit": false,
+	"ignored_packages": [
+		"AutoFileName",
+		"Neon Color Scheme",
+		"SideBarGit",
+		"Tag",
+		"Vintage"
+	],
+	"indent_guide_options": [
+		"draw_active"
+	],
+	"indent_to_bracket": true,
+	"margin": 0,
+	"match_brackets_angle": true,
+	"move_to_limit_on_up_down": true,
+	"open_files_in_new_window": "always",
+	"remember_workspace": false,
+	"rulers": [
+		60, 72, 80, 85, 120
+	],
+	"scroll_past_end": true,
+	"shift_tab_unindent": true,
+	"show_definitions": false,
+	"show_encoding": true,
+	"show_full_path": true,
+	"show_line_endings": true,
+	"smart_indent": false,
+	"spell_check": true,
+	"tab_completion": false,
+	"tab_size": 2,
+	"translate_tabs_to_spaces": true,
+	"trim_trailing_white_space_on_save": true,
+	"update_check": false,
+	"word_separators": "./\\()\"'_-–—“”‘”:,.;<>~!@#$%^&*|+=[]{}`~?",
+	"word_wrap": "true",
+	"wrap_width": 0
 }