# Add \`line_endings_button\` in VSCode settings to fix semantic merge conflict \(\#40745\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/de6750d3f4674da3f82f3d15b5c2029cfe4bbee6)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: de6750d3f4674da3f82f3d15b5c2029cfe4bbee6

Requested commit: de6750d3f4674da3f82f3d15b5c2029cfe4bbee6

Commit: de6750d3f4674da3f82f3d15b5c2029cfe4bbee6

Tree: 58dd19f2f1e0d634a64339acb866567376926012

Author: Jose Garcia

Committer: GitHub

## Message

```
Add `line_endings_button` in VSCode settings to fix semantic merge conflict (#40745)

I have partially solved a problem caused by a structure in commit:
f7a0971d2b9c366338dabad13fb494fe0a2c83b1

Release Notes:

- N/A

Before:
<img width="723" height="480" alt="image"
src="https://github.com/user-attachments/assets/6600e0af-36cf-4aec-ace1-7ee4921e001e"
/>

After: 
<img width="764" height="217" alt="image"
src="https://github.com/user-attachments/assets/52111c27-c67a-4224-82bd-782cc6e07f97"
/>
```

## Parents

- [4f5f29926520c6bf268b96720c594bd4375a2512](https://git.cafe/gitcafe/zed/commit/4f5f29926520c6bf268b96720c594bd4375a2512?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/de6750d3f4674da3f82f3d15b5c2029cfe4bbee6?format=markdown)