fine we merge: 2024-06-22T13:11:20

Affected files: .obsidian/plugins/obsidian-git/data.json content.md
RuralAnemone · Jun 22, 2024 · 35e9299 · 35e9299
1 parent 37f6650
commit 35e9299
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -32,7 +32,7 @@
 	- Go (beginning)
 - #### Markup Languages
 	- HTML (proficient)
-	- Markdown (proficient)
+	- Markdown (expert)
 		- Obsidian (proficient)
 	- CSS (proficient)
 	- SCSS (competent)