PromucFlow_constructor/app/client/packages/design-system
Ankita Kinger c7c7625384
fix: Resolving merge conflict (#38528)
## Description

Resolving merge conflict

Fixes #`Issue Number`  
_or_  
Fixes `Issue URL`
> [!WARNING]  
> _If no issue exists, please create an issue first, and check with the
maintainers if the issue is valid._

## Automation

/ok-to-test tags="@tag.IDE"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/12666175355>
> Commit: 639f92ac62fb0c633099c4ecfdfef514288a3561
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12666175355&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Sanity`
> Spec:
> <hr>Wed, 08 Jan 2025 08:25:59 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No

---------

Co-authored-by: Aparna Ramachandran <101863839+btsgh@users.noreply.github.com>
Co-authored-by: Abhijeet <41686026+abhvsn@users.noreply.github.com>
Co-authored-by: yatinappsmith <84702014+yatinappsmith@users.noreply.github.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
Co-authored-by: Rudraprasad Das <rudra@appsmith.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Trisha Anand <trisha1990@gmail.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Rahul Barwal <rahul.barwal@appsmith.com>
2025-01-08 13:58:56 +05:30
..
ads fix: Resolving merge conflict (#38528) 2025-01-08 13:58:56 +05:30
ads-old feat: Updated ads-old table to accept custom row component (#38334) 2024-12-24 11:38:07 +05:30
headless chore: refactor inputs (#36680) 2024-10-09 16:22:44 +05:30
theming chore: add custom widget to anvil (#37878) 2024-12-06 16:03:40 +05:30
widgets chore: fix form widgets bugs (#38492) 2025-01-07 17:34:15 +05:30
widgets-old fix: removing unused dependencies and explicitly installing used ones (#36573) 2024-09-30 12:28:46 +03:00