Skip to content

documentation(984305):Resolve issue #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

documentation(984305):Resolve issue #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1eb63b6
documentation(984305):Resolve issue
JamunaSundaramSF3699 Oct 13, 2025
b88972a
984305: Resolved conflict from diagram side
sivaranjith-78 Oct 13, 2025
4c05396
documentation(984305):Resolve issue
JamunaSundaramSF3699 Oct 14, 2025
46c4a96
Merge branch 'master' into 984305-conflict
IndrajithSrinivasan Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ej2-javascript-toc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,9 @@
<li>
<a href="/ej2-javascript/ai-assistview/ai-integrations/es5-ollama-llm-integration">Ollama LLM</a>
</li>
<li>
<a href="/ej2-javascript/ai-assistview/ai-integrations/es5-ollama-llm-integration">Ollama LLM</a>
</li>
</ul>
</li>
<li><a href="/ej2-javascript/ai-assistview/toolbar-items">Toolbar items</a></li>
Expand Down
2 changes: 1 addition & 1 deletion ej2-javascript/code-snippet/ai-assistview/ai-integrations/llm-model/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ function toolbarItemClicked(args) {
}

// Append the AI AssistView to the container
aiAssist.appendTo('#llmAssist');
aiAssist.appendTo('#llmAssist');
2 changes: 1 addition & 1 deletion ej2-javascript/code-snippet/ai-assistview/ai-integrations/llm-model/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ function toolbarItemClicked(args: ToolbarItemClickedEventArgs) {
}

// Append the AI AssistView to the container
aiAssist.appendTo('#llmAssist');
aiAssist.appendTo('#llmAssist');
4 changes: 0 additions & 4 deletions ej2-javascript/grid/getting-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ Following is the list of minimum dependencies required to use the grid.

## Setup for local development

<<<<<<< HEAD
Clone the Essential<sup style="font-size:70%">&reg;</sup> JS 2 quickstart application project from [GitHub](https://github.com/syncfusion/ej2-quickstart.git), and install the necessary npm packages using the following command line scripts.
=======
Clone the Essential JS 2 quickstart application project from [GitHub](https://github.com/syncfusion/ej2-quickstart), and install the necessary npm packages using the following command line scripts.
>>>>>>> dffb264cd8572d95b7b8d4750a807381c4a16357

```
git clone https://github.com/syncfusion/ej2-quickstart.git quickstart
Expand Down
3 changes: 3 additions & 0 deletions ej2-typescript-toc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@
<li>
<a href="/ej2-typescript/ai-assistview/ai-integrations/ollama-llm-integration">Ollama LLM</a>
</li>
<li>
<a href="/ej2-typescript/ai-assistview/ai-integrations/ollama-llm-integration">Ollama LLM</a>
</li>
</ul>
</li>
<li><a href="/ej2-typescript/ai-assistview/toolbar-items">Toolbar items</a></li>
Expand Down