Resolve 2026 vol2 main release dev to master conflicts#813
Open
NithyaSivaprakasam wants to merge 1335 commits into
Open
Resolve 2026 vol2 main release dev to master conflicts#813NithyaSivaprakasam wants to merge 1335 commits into
NithyaSivaprakasam wants to merge 1335 commits into
Conversation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
RTE Team conflicts resolved.
…304-Resolve-2025-vol4-mainrelease-dev-to-master-branch-merging-conflicts
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
Documentation(1027903): overview changes
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
DOCINFRA-2341_merged_using_automation
…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
Contributor
|
Build Status: INPROGRESS 🔃 |
Contributor
|
CI Status: FAILURE ❌ |
…-master-conflicts
Contributor
|
Build Status: INPROGRESS 🔃 |
Contributor
|
The running CI Job is terminated due to changes committed on the source branch for this Merge Request and CI triggered for latest commit. |
Contributor
|
CI Status: ABORTED ❌ |
Contributor
|
Build Status: INPROGRESS 🔃 |
Contributor
|
CI Status: FAILURE ❌ |
…e-2026-vol2-main-release-dev-to-master-conflicts
Contributor
|
Build Status: INQUEUE 🕒 |
Contributor
|
Build Status: INPROGRESS 🔃 |
Contributor
|
CI Status: FAILURE ❌ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.