Changed sublime_text label to *

1f7046a8 · Jared Christensen · c641ff53 · 1cca2e02 · 1f7046a8
Commit 1f7046a8 authored Aug 15, 2013 by Jared Christensen
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

h.json repository/h.json +10 -4

No files found.
--- a/repository/h.json
+++ b/repository/h.json
@@ -42,21 +42,27 @@
 			]
 		},
 		{
-			"details": "https://github.com/daaain/Handlebars",
+			"name": "Hammer Color Scheme",
+			"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer",
+			"labels": ["color scheme"],
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/daaain/Handlebars/tree/master"
+					"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer/tags"
 				}
 			]
 		},
 		{
-			"name": "Hammer Color Scheme",
-			"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer",
+			"details": "https://github.com/daaain/Handlebars",
 			"releases": [
 				{
+<<<<<<< HEAD
 				"sublime_text": "*",
 				"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer/tags"
+=======
+					"sublime_text": "*",
+					"details": "https://github.com/daaain/Handlebars/tree/master"
+>>>>>>> 1cca2e025c4b11cea038393455fa929333a10a68
 				}
 			]
 		},