fixed some syntax

mikecentola · mikecentola · commit 8ba3ca6d395d · 2019-09-18T20:19:52.000-04:00
diff --git a/snippets/mcode-snippets.json b/snippets/mcode-snippets.json
@@ -7,6 +7,11 @@
         ],
         "description": "Spindle Speed"
     },
+    "M05": {
+        "scope": "gcode",
+        "prefix": "M05",
+        "description": "Spindle Off"
+    },
     "M06": {
         "scope": "gcode",
         "prefix": "M06",
diff --git a/syntaxes/gcode.tmLanguage.json b/syntaxes/gcode.tmLanguage.json
@@ -71,11 +71,8 @@
         "operators": {
             "patterns": [
                 {
-<<<<<<< HEAD
-                    "match": "(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(LN)|(SQRT)|(MOD)|(EXP)",
-=======
                     "match": "(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(FIX)|(FUP)|(LN)|(ROUND)|(SQRT)",
->>>>>>> added snippets
+
                     "name": "support.constant.math.gcode"
                 },
                 {

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,8 @@`
`71`	`71`	`"operators": {`
`72`	`72`	`"patterns": [`
`73`	`73`	`{`
`74`		`-<<<<<<< HEAD`
`75`		`- "match": "(SIN)\|(COS)\|(TAN)\|(ASIN)\|(ACOS)\|(ATAN)\|(LN)\|(SQRT)\|(MOD)\|(EXP)",`
`76`		`-=======`
`77`	`74`	`"match": "(SIN)\|(COS)\|(TAN)\|(ASIN)\|(ACOS)\|(ATAN)\|(FIX)\|(FUP)\|(LN)\|(ROUND)\|(SQRT)",`
`78`		`->>>>>>> added snippets`
	`75`	`+`
`79`	`76`	`"name": "support.constant.math.gcode"`
`80`	`77`	`},`
`81`	`78`	`{`