Skip to content

Resolve 2026 vol2 main release dev to master conflicts#813

Open
NithyaSivaprakasam wants to merge 1332 commits into
developmentfrom
Resolve-2026-vol2-main-release-dev-to-master-conflicts
Open

Resolve 2026 vol2 main release dev to master conflicts#813
NithyaSivaprakasam wants to merge 1332 commits into
developmentfrom
Resolve-2026-vol2-main-release-dev-to-master-conflicts

Conversation

@NithyaSivaprakasam

Copy link
Copy Markdown

No description provided.

SyncfusionBuild and others added 30 commits December 6, 2025 14:07
RTE Team conflicts resolved.
…304-Resolve-2025-vol4-mainrelease-dev-to-master-branch-merging-conflicts
SyncfusionBuild and others added 28 commits May 28, 2026 14:08
Documentation(1027903): overview changes
…vascript-docs into Resolve-2026-vol2-main-release-dev-to-master-conflicts

# Conflicts:
#	ej2-javascript/code-snippet/accumulation-chart/tooltip-format/js/index.html
#	ej2-javascript/code-snippet/diagram/collaborative-editing-conflict-policy/index.css
#	ej2-javascript/code-snippet/diagram/collaborative-editing-diagram-changes/index.css
#	ej2-javascript/code-snippet/diagram/collaborative-editing-signalr-config/index.css
#	ej2-javascript/code-snippet/diagram/nodes-treeView/ts/index.html
#	ej2-javascript/code-snippet/gantt/autofit-columns-cs1/ts/index.html
#	ej2-javascript/code-snippet/gantt/checkbox-cs2/ts/index.html
#	ej2-javascript/code-snippet/gantt/column-rendering-cs1/index.css
#	ej2-javascript/code-snippet/gantt/column-rendering-cs1/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/column-rendering-cs2/index.css
#	ej2-javascript/code-snippet/gantt/column-rendering-cs2/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/column-rendering-cs3/index.css
#	ej2-javascript/code-snippet/gantt/column-rendering-cs3/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/column-rendering-cs4/index.css
#	ej2-javascript/code-snippet/gantt/column-rendering-cs4/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/column-rendering-cs5/index.css
#	ej2-javascript/code-snippet/gantt/column-rendering-cs5/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/column-rendering-cs6/index.css
#	ej2-javascript/code-snippet/gantt/column-resize-cs2/index.css
#	ej2-javascript/code-snippet/gantt/data-markers-cs3/index.css
#	ej2-javascript/code-snippet/gantt/exception-handling-cs1/datasource.ts
#	ej2-javascript/code-snippet/gantt/exception-handling-cs1/index.js
#	ej2-javascript/code-snippet/gantt/exception-handling-cs1/index.ts
#	ej2-javascript/code-snippet/gantt/getting-started-cs15/index.css
#	ej2-javascript/code-snippet/gantt/getting-started-cs15/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/getting-started-cs16/index.css
#	ej2-javascript/code-snippet/gantt/getting-started-cs16/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/getting-started-cs17/index.css
#	ej2-javascript/code-snippet/gantt/getting-started-cs17/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/getting-started-cs18/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/getting-started-cs21/ts/index.html
#	ej2-javascript/code-snippet/gantt/getting-started-cs22/ts/index.html
#	ej2-javascript/code-snippet/gantt/persist-selection-cs1/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/resource-view-cs4/ts/index.html
#	ej2-javascript/code-snippet/gantt/tree-column-cs2/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/tree-column-cs3/systemjs.config.js
#	ej2-javascript/code-snippet/gantt/tree-column-cs3/ts/index.html
#	ej2-javascript/code-snippet/gantt/tree-column-cs4/index.html
#	ej2-javascript/code-snippet/gantt/tree-column-cs5/ts/index.html
#	ej2-javascript/code-snippet/grid/modules-cs1/ts/index.html
#	ej2-javascript/code-snippet/pivot-table/pdf-export-cs42/systemjs.config.js
#	ej2-javascript/code-snippet/pivot-table/pdf-export-cs43/systemjs.config.js
#	ej2-javascript/code-snippet/pivot-table/pdf-export-cs44/systemjs.config.js
#	ej2-javascript/code-snippet/pivot-table/pdf-export-cs45/systemjs.config.js
#	ej2-javascript/code-snippet/rangenavigator/axis-cs20/js/index.html
#	ej2-javascript/code-snippet/rangenavigator/axis-cs21/js/index.html
#	ej2-javascript/code-snippet/rangenavigator/axis-cs22/js/index.html
#	ej2-javascript/code-snippet/treegrid/module-cs1/ts/index.html
#	ej2-javascript/diagram/grid-lines.md
#	ej2-javascript/diagram/js/connectors/connector-customization.md
#	ej2-javascript/diagram/js/labels/label-appearance.md
#	ej2-javascript/diagram/js/mysql-server-js.md
#	ej2-javascript/diagram/js/nodes/customization.md
#	ej2-javascript/diagram/js/symbol-palette/palette-customization.md
#	ej2-javascript/diagram/ts/getting-started.md
#	ej2-javascript/diagram/ts/mysql-server-ts.md
#	ej2-javascript/gantt/resources.md
#	ej2-javascript/markdown-editor/ts/getting-started.md
#	ej2-javascript/rich-text-editor/js/getting-started.md
#	ej2-javascript/rich-text-editor/ts/getting-started.md
#	ej2-javascript/ts/ai-tools/ai-powered-development.md
#	ej2-javascript/ts/getting-started/electron.md
#	ej2-javascript/ts/getting-started/quick-start.md
#	ej2-javascript/ts/getting-started/sharepoint.md
#	ej2-typescript-toc.html
@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: Not Started ❌
Build Location: Resolve-2026-vol2-main-release-dev-to-master-conflicts

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.

10 participants