From a17bb2bb0427dcfe8933517c0ea278ced5dd44f0 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 9 Jul 2024 18:08:21 -0700
Subject: [PATCH] chore: format

---
 docs/features/upcoming features.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/features/upcoming features.md b/docs/features/upcoming features.md
index 76adda00e..88f8e4453 100644
--- a/docs/features/upcoming features.md	
+++ b/docs/features/upcoming features.md	
@@ -2,6 +2,7 @@
 draft: true
 ---
 
+<<<<<<< HEAD
 ## high priority backlog
 
 - static dead link detection
@@ -9,6 +10,8 @@ draft: true
 - note/header/block transcludes: https://help.obsidian.md/Linking+notes+and+files/Embedding+files
 - docker support
 
+=======
+>>>>>>> 4b407e7 (chore: format)
 ## misc backlog
 
 - breadcrumbs component