Commit 863af670 authored by Kevin Yank's avatar Kevin Yank

Merge pull request #754 from halfninja/master

# By Nick Howes
# Via Nick Howes
* halfninja/master:
  Fix whitespace style in repositories.json
  FreeMarker syntax

Conflicts:
	repositories.json
parents 0bf5ad8b fa2a8dc8
...@@ -259,6 +259,7 @@ ...@@ -259,6 +259,7 @@
"https://github.com/guillaumebort/play2-sublimetext2", "https://github.com/guillaumebort/play2-sublimetext2",
"https://github.com/gumuz/currentscope", "https://github.com/gumuz/currentscope",
"https://github.com/hairyhum/SublimeStylishHaskell", "https://github.com/hairyhum/SublimeStylishHaskell",
"https://github.com/halfninja/SublimeFreeMarker",
"https://github.com/haraken3/SublimeRubyMotionBuilder", "https://github.com/haraken3/SublimeRubyMotionBuilder",
"https://github.com/harrism/sublimetext-cuda-cpp", "https://github.com/harrism/sublimetext-cuda-cpp",
"https://github.com/hdemirchian/CSSFormat", "https://github.com/hdemirchian/CSSFormat",
...@@ -1049,6 +1050,7 @@ ...@@ -1049,6 +1050,7 @@
"SublimeFiles": "Sublime Files", "SublimeFiles": "Sublime Files",
"SublimeFileSync": "FileSync", "SublimeFileSync": "FileSync",
"SublimeFileTemplates": "FileTemplates", "SublimeFileTemplates": "FileTemplates",
"SublimeFreeMarker": "FreeMarker",
"SublimeFunctionNameDisplay": "Function Name Display", "SublimeFunctionNameDisplay": "Function Name Display",
"SublimeGoBuild": "Go Build", "SublimeGoBuild": "Go Build",
"SublimeGtags": "GTags", "SublimeGtags": "GTags",
......
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