From 10ffce1caa51eb84cf8260b680f91fec1ec2a2f4 Mon Sep 17 00:00:00 2001
From: Isaac Shoebottom <ir.shoebottom@gmail.ca>
Date: Wed, 14 Feb 2024 11:43:36 -0400
Subject: [PATCH] 2024-02-14 11:43:36

---
 .obsidian/plugins/obsidian-git/data.json | 4 ++--
 .obsidian/workspace.json                 | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index f2dabf0..208f9e1 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -7,11 +7,11 @@
   "autoPullOnBoot": true,
   "disablePush": false,
   "pullBeforePush": true,
-  "disablePopups": false,
+  "disablePopups": true,
   "listChangedFilesInMessageBody": false,
   "showStatusBar": true,
   "updateSubmodules": true,
-  "syncMethod": "merge",
+  "syncMethod": "rebase",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": true,
   "treeStructure": false,
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 12053e4..6ff2f59 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -158,6 +158,7 @@
   },
   "active": "c6e1f6f3797edf57",
   "lastOpenFiles": [
+    "gcm-diagnose.log",
     "UNB/Year 4/Semester 2/CS2333/2024-02-12.md",
     "UNB/Year 4/Semester 2/STAT2593/2024-02-14.md",
     "UNB/Year 4/Semester 2/CS3873/2024-02-12.md",
@@ -184,8 +185,6 @@
     "UNB/Year 4/Semester 2/CS3873/2024-02-05.md",
     "UNB/Year 4/Semester 2/CS3873/2024-02-02.md",
     "UNB/Year 4/Semester 2/CS2333/2024-02-02.md",
-    "UNB/Year 4/Semester 2/CS2333/2024-01-31.md",
-    "gcm-diagnose.log",
     "Semester 2/STAT2593/Untitled",
     "Semester 2/STAT2593",
     "Semester 2",