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

Conflicts:
	repositories.json