merge with remote

guillermooo · guillermooo · commit 490d3b4cc7d2 · 2012-04-26T00:18:36.000+02:00
diff --git a/Support/PowershellSyntax.JSON-tmLanguage b/Support/PowershellSyntax.JSON-tmLanguage
@@ -74,7 +74,7 @@
 		},
 		{
 			"begin": "@\"$",
-			"end": "^\"@$",
+			"end": "^\"@",
 			"name": "string.quoted.double.heredoc.powershell",
 			"patterns": [
 				{
diff --git a/Support/PowershellSyntax.tmLanguage b/Support/PowershellSyntax.tmLanguage
@@ -122,7 +122,7 @@
 			<key>begin</key>
 			<string>@"$</string>
 			<key>end</key>
-			<string>^"@$</string>
+			<string>^"@</string>
 			<key>name</key>
 			<string>string.quoted.double.heredoc.powershell</string>
 			<key>patterns</key>

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@`
`74`	`74`	`},`
`75`	`75`	`{`
`76`	`76`	`"begin": "@\"$",`
`77`		`- "end": "^\"@$",`
	`77`	`+ "end": "^\"@",`
`78`	`78`	`"name": "string.quoted.double.heredoc.powershell",`
`79`	`79`	`"patterns": [`
`80`	`80`	`{`