Merge branch 'master' of gitlab.com:bebeco/home-folder

.config/sublime-text-3/Packages/User/Package Control.sublime-settings

@@ -29,6 +29,7 @@
 		"SublimeLinter",
 		"SublimeLinter-contrib-eslint",
 		"SublimeLinter-contrib-standard",
+		"Sublimerge 3",
 		"Terminal",
 		"Theme - Cobalt2"
 	]