public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2026-05-08 00:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

run pretty - revert crlf to lf

Browse Source 
since most modern ides handle lf on windows fine, and the entire project is in lf already, i'll set this back
This commit is contained in:
Volkor
2024-12-04 01:13:12 +11:00
parent 61524e1c44
commit e9fe58f818
4 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/features/SettingDialogue/settingConstants.ts
View File

@@ -137,11 +137,11 @@ export const SettingInformation: Partial<Record<keyof AllSettings, Configuration
},
checkConflictOnlyOnOpen: {
name: "Delay conflict resolution of inactive files",
desc: "Should we only check for conflicts when a file is opened?"
desc: "Should we only check for conflicts when a file is opened?",
},
showMergeDialogOnlyOnActive: {
name: "Delay merge conflict prompt for inactive files.",
desc: "Should we prompt you about conflicting files when a file is opened?"
desc: "Should we prompt you about conflicting files when a file is opened?",
},
disableMarkdownAutoMerge: {
name: "Always prompt merge conflicts",