fix merge conflicts

2012-05-23 22:21:18 +04:00 · 2012-05-23 22:21:18 +04:00 · 715a2f8635
commit 715a2f8635
parent d50f526495
2 changed files with 3 additions and 3 deletions
--- a/lib/ace/mode/yaml_highlight_rules.js
+++ b/lib/ace/mode/yaml_highlight_rules.js
@ -57,8 +57,8 @@ var YamlHighlightRules = function() {
                token: "variable",
                regex: "[&\\*][a-zA-Z0-9-_]+"
            }, {
-                token: "identifier",
-                regex: "(\\w+\\s*:)(?:\\w*)"
+                token: ["identifier", "text"],
+                regex: "(\\w+\\s*:)(\\w*)"
            }, {
                token : "keyword.operator",
                regex : "<<\\w*:\\w*"