Skip to content

Resolve 2026 vol2 main release dev to master conflicts#1046

Open
DeepakRajSundar wants to merge 50 commits into
masterfrom
Resolve-2026-vol2-main-release-dev-to-master-conflicts
Open

Resolve 2026 vol2 main release dev to master conflicts#1046
DeepakRajSundar wants to merge 50 commits into
masterfrom
Resolve-2026-vol2-main-release-dev-to-master-conflicts

Conversation

@DeepakRajSundar

Copy link
Copy Markdown
Collaborator

No description provided.

SyncfusionBuild and others added 20 commits June 3, 2026 19:39
…act-docs into Resolve-2026-vol2-main-release-dev-to-master-conflicts

# Conflicts:
#	ej2-react-toc.html
#	ej2-react/code-snippet/3d-chart/tooltip/tooltip-cs6/index.html
#	ej2-react/code-snippet/3d-chart/tooltip/tooltip-cs6/systemjs.config.js
#	ej2-react/code-snippet/ai-assistview/speech/tts-settings/index.html
#	ej2-react/code-snippet/chart/preview-sample/user-interaction/tooltip-cs14/systemjs.config.js
#	ej2-react/code-snippet/circular-chart/preview-sample/tooltip/tooltip-cs8/index.html
#	ej2-react/code-snippet/gantt/run-cs1/app/App.jsx
#	ej2-react/code-snippet/gantt/run-cs1/app/App.tsx
#	ej2-react/code-snippet/gantt/run-cs1/app/index.jsx
#	ej2-react/code-snippet/gantt/run-cs1/app/index.tsx
#	ej2-react/code-snippet/sankey/preview-sample/tooltip/format-cs2/index.html
#	ej2-react/code-snippet/stock-chart/technical-indicators-cs2/index.html
#	ej2-react/diagram/collaborative-editing/collaborative-editing.md
#	ej2-react/diagram/getting-started.md
#	ej2-react/diagram/module-injection.md
#	ej2-react/diagram/mysql-server.md
#	ej2-react/file-manager/file-system-provider.md
#	ej2-react/gantt/accessibility.md
#	ej2-react/gantt/getting-started.md
#	ej2-react/gantt/module.md
#	ej2-react/getting-started/gatsby.md
#	ej2-react/getting-started/nextjs.md
#	ej2-react/getting-started/preact.md
#	ej2-react/getting-started/react-remix-app.md
#	ej2-react/getting-started/sharepoint.md
#	ej2-react/getting-started/vite.md
#	ej2-react/grid/getting-started.md
#	ej2-react/grid/nextjs-getting-started.md
#	ej2-react/grid/preact.md
#	ej2-react/grid/sharepoint.md
#	ej2-react/markdown-editor/getting-started.md
#	ej2-react/rich-text-editor/getting-started.md
#	ej2-react/treegrid/getting-started.md
#	ej2-react/treegrid/preact.md
#	ej2-react/ui-kit/images/local-development-server-running.PNG
#	ej2-react/ui-kit/overview.md
…act-docs into Resolve-2026-vol2-main-release-dev-to-master-conflicts

# Conflicts:
#	ej2-react-toc.html
#	ej2-react/code-snippet/3d-chart/tooltip/tooltip-cs6/index.html
#	ej2-react/code-snippet/3d-chart/tooltip/tooltip-cs6/systemjs.config.js
#	ej2-react/code-snippet/ai-assistview/speech/tts-settings/index.html
#	ej2-react/code-snippet/chart/preview-sample/user-interaction/tooltip-cs14/systemjs.config.js
#	ej2-react/code-snippet/circular-chart/preview-sample/tooltip/tooltip-cs8/index.html
#	ej2-react/code-snippet/gantt/run-cs1/app/App.jsx
#	ej2-react/code-snippet/gantt/run-cs1/app/App.tsx
#	ej2-react/code-snippet/gantt/run-cs1/app/index.jsx
#	ej2-react/code-snippet/gantt/run-cs1/app/index.tsx
#	ej2-react/code-snippet/sankey/preview-sample/tooltip/format-cs2/index.html
#	ej2-react/code-snippet/stock-chart/technical-indicators-cs2/index.html
#	ej2-react/diagram/collaborative-editing/collaborative-editing.md
#	ej2-react/diagram/getting-started.md
#	ej2-react/diagram/module-injection.md
#	ej2-react/diagram/mysql-server.md
#	ej2-react/file-manager/file-system-provider.md
#	ej2-react/gantt/accessibility.md
#	ej2-react/gantt/getting-started.md
#	ej2-react/gantt/module.md
#	ej2-react/getting-started/gatsby.md
#	ej2-react/getting-started/nextjs.md
#	ej2-react/getting-started/preact.md
#	ej2-react/getting-started/react-remix-app.md
#	ej2-react/getting-started/sharepoint.md
#	ej2-react/getting-started/vite.md
#	ej2-react/grid/getting-started.md
#	ej2-react/grid/nextjs-getting-started.md
#	ej2-react/grid/preact.md
#	ej2-react/grid/sharepoint.md
#	ej2-react/markdown-editor/getting-started.md
#	ej2-react/rich-text-editor/getting-started.md
#	ej2-react/treegrid/getting-started.md
#	ej2-react/treegrid/preact.md
#	ej2-react/ui-kit/images/local-development-server-running.PNG
#	ej2-react/ui-kit/overview.md
@SyncfusionBuild

Copy link
Copy Markdown
Contributor

Build Status: INQUEUE 🕒
Build Location: Resolve-2026-vol2-main-release-dev-to-master-conflicts

@SyncfusionBuild

Copy link
Copy Markdown
Contributor

Build Status: INPROGRESS 🔃
Build Location: Resolve-2026-vol2-main-release-dev-to-master-conflicts

@SyncfusionBuild

Copy link
Copy Markdown
Contributor

CI Status: FAILURE ❌
Source Compilation: SUCCESS ✅
Failure Reason: CI Failure with violation
Build Location: Resolve-2026-vol2-main-release-dev-to-master-conflicts
Technical Error(s): 0
Spelling Error(s): 1
Image Alt Text Error(s): 0
Image Size Error(s): 0
Image Name Error(s): 0
Front matter Error(s): 0
File Path 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