Commit 8bd2e751 authored by bthota's avatar bthota

resolving ordering conflicts

parent 3709b8d5
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
"https://bitbucket.org/dotCypress/coffeelint", "https://bitbucket.org/dotCypress/coffeelint",
"https://bitbucket.org/dotCypress/haskellbuddy", "https://bitbucket.org/dotCypress/haskellbuddy",
"https://bitbucket.org/esquivias/sublime-aml", "https://bitbucket.org/esquivias/sublime-aml",
"https://github.com/balajithota85/sublime_scaffolding",
"https://bitbucket.org/hmml/jsonlint", "https://bitbucket.org/hmml/jsonlint",
"https://bitbucket.org/hullabaloo/sublime-http-response-headers-snippets", "https://bitbucket.org/hullabaloo/sublime-http-response-headers-snippets",
"https://bitbucket.org/inkytonik/scalaworksheet", "https://bitbucket.org/inkytonik/scalaworksheet",
...@@ -123,6 +122,7 @@ ...@@ -123,6 +122,7 @@
"https://github.com/b-g/processing-sublime", "https://github.com/b-g/processing-sublime",
"https://github.com/b3ni/Sublime-Fabric", "https://github.com/b3ni/Sublime-Fabric",
"https://github.com/badsyntax/SassBeautify", "https://github.com/badsyntax/SassBeautify",
"https://github.com/balajithota85/sublime_scaffolding",
"https://github.com/balazstth/subl-esp", "https://github.com/balazstth/subl-esp",
"https://github.com/bartTC/SubDpaste", "https://github.com/bartTC/SubDpaste",
"https://github.com/bbonora/SublimeCMSMadeSimple", "https://github.com/bbonora/SublimeCMSMadeSimple",
...@@ -1465,7 +1465,6 @@ ...@@ -1465,7 +1465,6 @@
"SASS-Build-SublimeText2": "SASS Build", "SASS-Build-SublimeText2": "SASS Build",
"SASS-Snippets": "SASS Snippets", "SASS-Snippets": "SASS Snippets",
"sass-textmate-bundle": "Sass", "sass-textmate-bundle": "Sass",
"sublime_scaffolding": "Scaffolding",
"scriptcs-sublime": "scriptcs", "scriptcs-sublime": "scriptcs",
"SCSS-Snippets": "SCSS Snippets", "SCSS-Snippets": "SCSS Snippets",
"SCSS.tmbundle": "SCSS", "SCSS.tmbundle": "SCSS",
...@@ -1823,6 +1822,7 @@ ...@@ -1823,6 +1822,7 @@
"sublime_new_from_selection": "New from Selection", "sublime_new_from_selection": "New from Selection",
"sublime_python_imports": "Python Imports Sorter", "sublime_python_imports": "Python Imports Sorter",
"sublime_rubocop": "RuboCop", "sublime_rubocop": "RuboCop",
"sublime_scaffolding": "Scaffolding",
"sublime_splittobuffer": "Split To Buffer", "sublime_splittobuffer": "Split To Buffer",
"sublime_text_alternative_autocompletion": "Alternative Autocompletion", "sublime_text_alternative_autocompletion": "Alternative Autocompletion",
"sublime_unicode_nbsp": "Unicode Character Highlighter", "sublime_unicode_nbsp": "Unicode Character Highlighter",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment