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

---
 .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