Chosto
/
codium-settings
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

main
Quentin Duchemin 2024-05-04 17:03:00 +02:00
parent d7c2fbc1f1
commit 907d37f5a3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
profiles/main/data/settings.json
View File

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