From 907d37f5a343de7c85dd581c8bd88736add5f4d3 Mon Sep 17 00:00:00 2001 From: Quentin Duchemin Date: Sat, 4 May 2024 17:03:00 +0200 Subject: [PATCH] Merge --- profiles/main/data/settings.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/profiles/main/data/settings.json b/profiles/main/data/settings.json index 00c480c..1332592 100644 --- a/profiles/main/data/settings.json +++ b/profiles/main/data/settings.json @@ -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 ») } \ No newline at end of file