From 7f9f9dca8ae4fa3bfea471d49051a3e38844d563 Mon Sep 17 00:00:00 2001 From: Blake Allen Date: Tue, 26 Oct 2021 12:44:25 -0700 Subject: [PATCH] fix conflict fix --- content/_index.md | 2 +- content/moc/{direc tory.md => directory.md} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename content/moc/{direc tory.md => directory.md} (100%) diff --git a/content/_index.md b/content/_index.md index 657cb17b..b665a3de 100644 --- a/content/_index.md +++ b/content/_index.md @@ -20,4 +20,4 @@ I was really inspired by [Bianca](https://garden.bianca.digital/) and [Joel](htt ## Get Started The entire Quartz documentation is fully hosted using Quartz! To get started, let's visit the main directory. -👉 [Directory](moc/direc%20tory.md) \ No newline at end of file +👉 [Directory](moc/directory.md) \ No newline at end of file diff --git a/content/moc/direc tory.md b/content/moc/directory.md similarity index 100% rename from content/moc/direc tory.md rename to content/moc/directory.md