diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json index 74a9e5b..018044d 100644 --- a/.obsidian/plugins/obsidian-git/data.json +++ b/.obsidian/plugins/obsidian-git/data.json @@ -12,7 +12,7 @@ "listChangedFilesInMessageBody": true, "showStatusBar": true, "updateSubmodules": true, - "syncMethod": "rebase", + "syncMethod": "merge", "customMessageOnAutoBackup": false, "autoBackupAfterFileChange": false, "treeStructure": false, diff --git a/content.md b/content.md index 76d1d9b..43477c2 100644 --- a/content.md +++ b/content.md @@ -32,7 +32,7 @@ - Go (beginning) - #### Markup Languages - HTML (proficient) - - Markdown (proficient) + - Markdown (expert) - Obsidian (proficient) - CSS (proficient) - SCSS (competent)