Merge pull request #4594 from syncfusion-content/BLAZ-789056-conflict

Resolved Conflicts in ej2-asp-core-mvc-docs

Author: PrinceOliver

ej2-asp-core-mvc/datepicker/EJ2_ASP.MVC/timezone-behavior.md

@@ -26,10 +26,19 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
 
 N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
 
-The following example demonstrates how to configure the serverTimezoneOffset property
+{% if page.publishingplatform == "aspnet-core" %}
 
 {% tabs %}
 {% highlight cshtml tabtitle="CSHTML" %}
+{% include code-snippet/datepicker/timezone-cs1/tagHelper %}
+{% endhighlight %}
+{% endtabs %}
+
+{% elsif page.publishingplatform == "aspnet-mvc" %}
+
+{% tabs %}
+{% highlight razor tabtitle="CSHTML" %}
 {% include code-snippet/datepicker/timezone-cs1/razor %}
 {% endhighlight %}
-{% endtabs %}
+{% endtabs %}
+{% endif %}

ej2-asp-core-mvc/datepicker/EJ2_ASP.NETCORE/timezone-behavior.md

@@ -26,10 +26,19 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
 
 N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
 
-The following example demonstrates how to configure the serverTimezoneOffset property
+{% if page.publishingplatform == "aspnet-core" %}
 
 {% tabs %}
 {% highlight cshtml tabtitle="CSHTML" %}
 {% include code-snippet/datepicker/timezone-cs1/tagHelper %}
 {% endhighlight %}
 {% endtabs %}
+
+{% elsif page.publishingplatform == "aspnet-mvc" %}
+
+{% tabs %}
+{% highlight razor tabtitle="CSHTML" %}
+{% include code-snippet/datepicker/timezone-cs1/razor %}
+{% endhighlight %}
+{% endtabs %}
+{% endif %}

ej2-asp-core-mvc/datetimepicker/EJ2_ASP.MVC/timezone-behavior.md

@@ -26,10 +26,19 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
 
 N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
 
-The following example demonstrates how to configure the serverTimezoneOffset property
+{% if page.publishingplatform == "aspnet-core" %}
 
 {% tabs %}
 {% highlight cshtml tabtitle="CSHTML" %}
+{% include code-snippet/datetimepicker/timezone-cs1/tagHelper %}
+{% endhighlight %}
+{% endtabs %}
+
+{% elsif page.publishingplatform == "aspnet-mvc" %}
+
+{% tabs %}
+{% highlight razor tabtitle="CSHTML" %}
 {% include code-snippet/datetimepicker/timezone-cs1/razor %}
 {% endhighlight %}
-{% endtabs %}
+{% endtabs %}
+{% endif %}

ej2-asp-core-mvc/datetimepicker/EJ2_ASP.NETCORE/timezone-behavior.md

@@ -26,10 +26,19 @@ The `serverTimezoneOffset` property allows you to specify the server's time zone
 
 N> The `serverTimezoneOffset` property is applicable **only for pre-bound values** (i.e., values set during initialization or data binding). It does **not affect** values selected by the user during runtime.
 
-The following example demonstrates how to configure the serverTimezoneOffset property
+{% if page.publishingplatform == "aspnet-core" %}
 
 {% tabs %}
 {% highlight cshtml tabtitle="CSHTML" %}
 {% include code-snippet/datetimepicker/timezone-cs1/tagHelper %}
 {% endhighlight %}
-{% endtabs %}
+{% endtabs %}
+
+{% elsif page.publishingplatform == "aspnet-mvc" %}
+
+{% tabs %}
+{% highlight razor tabtitle="CSHTML" %}
+{% include code-snippet/datetimepicker/timezone-cs1/razor %}
+{% endhighlight %}
+{% endtabs %}
+{% endif %}