@@ -142,6 +142,7 @@ Core Grammars:
142
142
- fix(rust) fix for r# raw identifier not being highlighted correctly. [ JaeBaek Lee] [ ]
143
143
- enh(rust) Adding union to be recognized as a keyword in Rust. [ JaeBaek Lee] [ ]
144
144
- fix(yaml) fix for yaml with keys having brackets highlighted incorrectly [ Aneesh Kulkarni] [ ]
145
+ <<<<<<< HEAD
145
146
- fix(csharp) add raw string highlighting for C# 11. [ Tara] [ ]
146
147
- fix(bash) fix # within token being detected as the start of a comment [ Felix Uhl] [ ]
147
148
- fix(python) fix ` or ` conflicts with string highlighting [ Mohamed Ali] [ ]
@@ -178,6 +179,8 @@ New Grammars:
178
179
- added 3rd party Phix grammar to SUPPORTED_LANGUAGES [ PeteLomax] [ ]
179
180
- added 3rd party Mirth grammar to SUPPORTED_LANGUAGES [ Sierra] [ ]
180
181
- added 3rd party JSONata grammar to SUPPORTED_LANGUAGES [ Vlad Dimov] [ ]
182
+ =======
183
+ >>>>>>> parent of d78749a5 (fix(bash): Comments false positives (#3918 ))
181
184
182
185
Developer Tool:
183
186
@@ -202,6 +205,7 @@ Themes:
202
205
[ Kristian Ekenes ] : https://github.com/ekenes
203
206
[ Aneesh Kulkarni ] : https://github.com/aneesh98
204
207
[ Bruno Meneguele ] : https://github.com/bmeneg
208
+ <<<<<<< HEAD
205
209
[ Tara ] : https://github.com/taralei
206
210
[ Felix Uhl ] : https://github.com/iFreilicht
207
211
[ nataliia-radina ] : https://github.com/Nataliia-Radina
@@ -228,6 +232,9 @@ Themes:
228
232
[ Sierra ] : https://github.com/casuallyblue
229
233
[ Vlad Dimov ] : https://github.com/DevDimov
230
234
[ Chiel van de Steeg ] : https://github.com/cvdsteeg
235
+ =======
236
+
237
+ >>>>>>> parent of d78749a5 (fix(bash): Comments false positives (#3918 ))
231
238
232
239
## Version 11.9.0
233
240
0 commit comments