Skip to content

Feat/cs 44495 merge conflicts#28

Merged
abhinav-from-contentstack merged 2 commits intonextfrom
feat/cs-44495-merge-conflicts
Mar 26, 2024
Merged

Feat/cs 44495 merge conflicts#28
abhinav-from-contentstack merged 2 commits intonextfrom
feat/cs-44495-merge-conflicts

Conversation

@abhinav-from-contentstack
Copy link
Contributor

  • resolved merge conflicts

sunil-lakshman and others added 2 commits February 29, 2024 10:59
* Fixed snyk issues and added auto publish package support in github action. (#18)

* Fixed snyk issues and added auto publish package support in github ac… (#20)

* Fixed snyk issues and added auto publish package support in github action.

* Added security file and updated license

* Updated changelog file message

* Updated python version in github action file

* Updated pip and pylint

* Feat/cs 44004 json rte nested list fragment (#21)

* Fixed snyk issues and added auto publish package support in github ac… (#19)

* Fixed snyk issues and added auto publish package support in github action. (#18)

* Fixed snyk issues and added auto publish package support in github ac… (#20)

* Fixed snyk issues and added auto publish package support in github action.

* Added security file and updated license

* Updated changelog file message

* Updated python version in github action file

* Updated pip and pylint

* Added fragment style attribute in JSON RTE nested list

Updated License file.

* Fix/cs 44004 changed host name (#23)

* Added fragment style attribute in JSON RTE nested list

Updated License file.

* Changed dev url to prod url
@abhinav-from-contentstack abhinav-from-contentstack requested a review from a team as a code owner March 26, 2024 08:04
Copy link
Contributor

@sunil-lakshman sunil-lakshman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@abhinav-from-contentstack abhinav-from-contentstack deleted the feat/cs-44495-merge-conflicts branch March 26, 2024 08:06
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.

2 participants

Comments