Merge
parent
d7c2fbc1f1
commit
907d37f5a3
|
@ -25,15 +25,10 @@
|
|||
"syncSettings.hooks.preDownload": "git -C ~/.config/codium-settings pull",
|
||||
"syncSettings.hooks.postUpload": "git -C ~/.config/codium-settings push",
|
||||
"syncSettings.gitInitMessage": "Init settings from {{hostname}}, profile « {{profile}} »",
|
||||
<<<<<<< HEAD
|
||||
"syncSettings.gitUpdateMessage": "Update settings from {{hostname}}, profile « {{profile}} »",
|
||||
"redhat.telemetry.enabled": false,
|
||||
"ansible.ansible.useFullyQualifiedCollectionNames": false,
|
||||
"ansible.validation.lint.arguments": "--fix --skip-list=risky-file-permissions"
|
||||
||||||| parent of dde2ab7 (Update settings from , profile « main »)
|
||||
"syncSettings.gitUpdateMessage": "Update settings from {{hostname}}, profile « {{profile}} »"
|
||||
=======
|
||||
"syncSettings.gitUpdateMessage": "Update settings from {{hostname}}, profile « {{profile}} »",
|
||||
"ansible.validation.lint.arguments": "--fix --skip-list=risky-file-permissions",
|
||||
"latex-workshop.latex.recipe.default": "tectonic",
|
||||
"latex-workshop.latex.autoBuild.run": "onSave",
|
||||
"latex-workshop.latex.outDir": "%WORKSPACE_FOLDER%/build/index",
|
||||
|
@ -52,5 +47,4 @@
|
|||
"env": {}
|
||||
}
|
||||
]
|
||||
>>>>>>> dde2ab7 (Update settings from , profile « main »)
|
||||
}
|
Loading…
Reference in New Issue