GH-145 Resolve merge conflicts

sharkio-dev / sharkio

Sharkio is an API proxy for your development environments. It records all the requests that are sent to your API. It allows you to replay the requests easily. Generate types, documentation, test suites, And interact with your API using AI.

https://sharkio.dev/

MIT License

5 stars 1 forks source link

GH-145 Resolve merge conflicts #161

Closed SID262000 closed 1 year ago

SID262000 commented 1 year ago

Resolving Merge Conflicts caused as a result of the execution of pre-commit hook for the very first time.

Please make sure to pull in these changes and then start your local work to avoid a huge set of merge conflicts.

Reference: #145