resolve merge conflicts

1 files changed, 20 insertions, 0 deletions

diff --git a/content/posts/posts-section.md b/content/posts/posts-section.md
new file mode 100644
index 0000000..c90ec99
--- /dev/null
+++ b/content/posts/posts-section.md
@@ -0,0 +1,20 @@
++++
+title = "Posts Transparent Section"
+date = 2021-05-04
+draft = false
+
+[taxonomies]
+categories = ["Features"]
+tags = ["config"]
++++
+
+You can place your content in content/posts/ instead of content/ this will make post urls example.com/posts/post-title
+<!-- more -->
+In the posts directory you will see the _index.md:
+
+```md
++++
+transparent = true
+redirect_to = "/"
++++
+```