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

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

@@ -17,6 +17,7 @@
 		"EmotiCODE",
 		"Format JSDoc @params",
 		"Git",
+		"Git Conflict Resolver",
 		"GitGutter",
 		"HTML-CSS-JS Prettify",
 		"Jade",