Commit 8bbfee3c authored by Jared Christensen's avatar Jared Christensen

fixed problems

parent 1f7046a8
...@@ -42,27 +42,21 @@ ...@@ -42,27 +42,21 @@
] ]
}, },
{ {
"name": "Hammer Color Scheme", "details": "https://github.com/daaain/Handlebars",
"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer",
"labels": ["color scheme"],
"releases": [ "releases": [
{ {
"sublime_text": "*", "sublime_text": "*",
"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer/tags" "details": "https://github.com/daaain/Handlebars/tree/master"
} }
] ]
}, },
{ {
"details": "https://github.com/daaain/Handlebars", "name": "Hammer Color Scheme",
"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer",
"releases": [ "releases": [
{ {
<<<<<<< HEAD
"sublime_text": "*", "sublime_text": "*",
"details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer/tags" "details": "https://github.com/jared-christensen/sublime-2-color-scheme-hammer/tags"
=======
"sublime_text": "*",
"details": "https://github.com/daaain/Handlebars/tree/master"
>>>>>>> 1cca2e025c4b11cea038393455fa929333a10a68
} }
] ]
}, },
...@@ -559,4 +553,4 @@ ...@@ -559,4 +553,4 @@
] ]
} }
] ]
} }
\ No newline at end of file
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