Skip to content

Resolve 2026 vol1 sp release dev to master branch merging conflicts#772

Open
DeepakRajSundar wants to merge 20 commits intomasterfrom
Resolve-2026-vol1-SP-release-dev-to-master-branch-merging-conflicts
Open

Resolve 2026 vol1 sp release dev to master branch merging conflicts#772
DeepakRajSundar wants to merge 20 commits intomasterfrom
Resolve-2026-vol1-SP-release-dev-to-master-branch-merging-conflicts

Conversation

@DeepakRajSundar
Copy link
Copy Markdown
Collaborator

No description provided.

SyncfusionBuild and others added 20 commits March 17, 2026 12:14
…vascript-docs into Resolve-2026-vol1-SP-release-dev-to-master-branch-merging-conflicts

# Conflicts:
#	ej2-javascript/chart/tool-tip.md
#	ej2-javascript/chat-ui/ts/getting-started.md
#	ej2-javascript/code-snippet/chart/chart-types-cs474/index.ts
#	ej2-javascript/code-snippet/gantt/timeline-cs1/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/gemini-ai/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/gemini-ai/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/lite-llm/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/lite-llm/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/llm-model/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/llm-model/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/open-ai/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/ai-integrations/open-ai/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/command-settings/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/command-settings/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/close/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/close/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/created/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/created/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/open/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/open/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/prompt-request/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/events/prompt-request/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/globalization/enable-rtl/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/globalization/enable-rtl/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/globalization/localization/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/globalization/localization/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-assist/prompt/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-assist/prompt/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-assist/prompts/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-assist/prompts/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-assist/root-config/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-assist/root-config/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-toolbar/props/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-toolbar/props/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-toolbar/template/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-toolbar/template/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-toolbar/toolbar-position/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/inline-toolbar/toolbar-position/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/add-response/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/add-response/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/execute-prompt/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/execute-prompt/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/show-hide-commandpopup/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/show-hide-commandpopup/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/show-hide-componentpopup/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/methods/show-hide-componentpopup/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/relateTo-target/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/response-settings/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/response-settings/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/templates/editor-template/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/templates/editor-template/ts/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/templates/response-template/js/index.html
#	ej2-javascript/code-snippet/inline-ai-assist/templates/response-template/ts/index.html
#	ej2-javascript/gantt/timeline/timeline.md
#	ej2-javascript/inline-ai-assist/inline-assist.md
#	ej2-javascript/inline-ai-assist/response-settings.md
#	ej2-javascript/inline-ai-assist/ts/ai-integrations/openai-integration.md
#	ej2-javascript/pivotview/aggregation.md
#	ej2-javascript/pivotview/calculated-field.md
#	ej2-javascript/pivotview/data-binding.md
#	ej2-javascript/pivotview/field-list.md
#	ej2-javascript/pivotview/filtering.md
#	ej2-javascript/ts/skills.md
@SyncfusionBuild
Copy link
Copy Markdown
Contributor

Build Status: INPROGRESS 🔃
Build Location: Resolve-2026-vol1-SP-release-dev-to-master-branch-merging-conflicts

@SyncfusionBuild
Copy link
Copy Markdown
Contributor

CI Status: FAILURE ❌
Source Compilation: FAILURE ❌
Failure Reason: Compilation Error
Build Location: Resolve-2026-vol1-SP-release-dev-to-master-branch-merging-conflicts
Technical Error(s): 0
Spelling Error(s): 0
Image Alt Text Error(s): 0
Image Size Error(s): 0
Image Name Error(s): 0
Front matter Error(s): 0
CodeSnippet File Path Missing Error(s): 0
Toc Anchor Tags Validation Error(s): 0
MD Tag Validation Error(s): 0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants