Fix language.md conflicT
This commit is contained in:
Родитель
4709e4db1f
Коммит
08cc454619
|
@ -23,6 +23,7 @@
|
|||
   <a name="Keyword--mdwbm0b"></a>`` model ``
|
||||
   <a name="Keyword-lpev-y-g"></a>`` namespace ``
|
||||
   <a name="Keyword-ytodrzn0"></a>`` op ``
|
||||
   <a name="Keyword-rmwjtwx9"></a>`` extends ``
|
||||
|
||||
  <a name="Identifier"></a>*Identifier* **:**
|
||||
   <a name="Identifier-exwdmcdi"></a>*[IdentifierName](#IdentifierName)* **but not** *[Keyword](#Keyword)*
|
||||
|
@ -174,11 +175,11 @@
|
|||
   <a name="ModelStatement-gvibrs-4"></a>*[DecoratorList](#DecoratorList)*<sub>opt</sub> `` model `` *[Identifier](#Identifier)* *[TemplateParameters](#TemplateParameters)*<sub>opt</sub> `` = `` *[Expression](#Expression)* `` ; ``
|
||||
|
||||
  <a name="ModelHeritage"></a>*ModelHeritage* **:**
|
||||
   <a name="ModelHeritage-89ed0718"></a>`` extends `` *[ReferenceExpressionList](#ReferenceExpressionList)*
|
||||
   <a name="ModelHeritage-ie0hgn59"></a>`` extends `` *[ReferenceExpressionList](#ReferenceExpressionList)*
|
||||
|
||||
  <a name="ReferenceExpressionList"></a>*ReferenceExpressionList* **:**
|
||||
   <a name="ReferenceExpressionList-98f10901"></a>*[ReferenceExpression](#ReferenceExpression)*
|
||||
   <a name="ReferenceExpressionList-458ef435"></a>*[ReferenceExpressionList](#ReferenceExpressionList)* `` , `` *[ReferenceExpression](#ReferenceExpression)*
|
||||
   <a name="ReferenceExpressionList-mpejatd_"></a>*[ReferenceExpression](#ReferenceExpression)*
|
||||
   <a name="ReferenceExpressionList-ry70nwgl"></a>*[ReferenceExpressionList](#ReferenceExpressionList)* `` , `` *[ReferenceExpression](#ReferenceExpression)*
|
||||
|
||||
  <a name="TemplateParameters"></a>*TemplateParameters* **:**
|
||||
   <a name="TemplateParameters-m5tcjdl1"></a>`` < `` *[IdentifierList](#IdentifierList)* `` > ``
|
||||
|
@ -202,7 +203,7 @@
|
|||
   <a name="ModelProperty-vmgvgt2o"></a>*[DecoratorList](#DecoratorList)*<sub>opt</sub> *[StringLiteral](#StringLiteral)* `` ? ``<sub>opt</sub> `` : `` *[Expression](#Expression)*
|
||||
|
||||
  <a name="ModelSpreadProperty"></a>*ModelSpreadProperty* **:**
|
||||
   <a name="ModelSpreadProperty-uh6b21ad"></a>`` ... `` *[Identifier](#Identifier)*
|
||||
   <a name="ModelSpreadProperty-r9kkoml-"></a>`` ... `` *[ReferenceExpression](#ReferenceExpression)*
|
||||
|
||||
  <a name="NamespaceStatement"></a>*NamespaceStatement* **:**
|
||||
   <a name="NamespaceStatement-lllfloam"></a>*[DecoratorList](#DecoratorList)*<sub>opt</sub> `` namespace `` *[Identifier](#Identifier)* `` { `` *[NamespaceBody](#NamespaceBody)*<sub>opt</sub> `` } ``
|
||||
|
|
Загрузка…
Ссылка в новой задаче