From a14d06aa3d37396531dbfe09bb3b18b7eb9b96ad Mon Sep 17 00:00:00 2001
From: Blake Allen <blakesnake100@gmail.com>
Date: Tue, 26 Oct 2021 19:44:25 +0000
Subject: [PATCH] fix conflict fix

---
 .gitignore |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0de2938..1eaad60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
 public
 resources
 .idea
-content/.obsidian
\ No newline at end of file
+content/.obsidian
+data/linkIndex.yaml
+data/contentIndex.yaml
\ No newline at end of file

--
Gitblit v1.10.0