Resolve merge conflict

Author: code-warrior

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

@@ -68,7 +68,7 @@
 	"tab_completion": false,
 	"tab_size": 2,
 	"translate_tabs_to_spaces": true,
-	"trim_trailing_white_space_on_save": "all",
+	"trim_trailing_white_space_on_save": true,
 	"update_check": false,
 	"word_separators": "./\\()\"'_-–—“”‘”:,.;<>~!@#$%^&*|+=[]{}`~?",
 	"word_wrap": "true",