resolve merge conflicts

4 files changed, 46 insertions, 2 deletions

diff --git a/content/posts/_index.fr.md b/content/posts/_index.fr.md
new file mode 100644
index 0000000..6b70666
--- /dev/null
+++ b/content/posts/_index.fr.md
@@ -0,0 +1,4 @@
++++
+transparent = true
+redirect_to = "/"
++++
diff --git a/content/posts/_index.md b/content/posts/_index.md
index e381261..6b70666 100644
--- a/content/posts/_index.md
+++ b/content/posts/_index.md
@@ -1,4 +1,4 @@
 +++
-title = "posts"
-template = "posts.html"
+transparent = true
+redirect_to = "/"
 +++
diff --git a/content/posts/posts-section.fr.md b/content/posts/posts-section.fr.md
new file mode 100644
index 0000000..63e71af
--- /dev/null
+++ b/content/posts/posts-section.fr.md
@@ -0,0 +1,20 @@
++++
+title = "Posts Transparent Section"
+date = 2021-05-04
+draft = false
+
+[taxonomies]
+categories = ["Features"]
+tags = ["config"]
++++
+
+Vous pouvez placer votre contenu dans content/posts/ au lieu de content/ cela fera des URL de publication example.com/posts/post-title
+<!-- more -->
+Dans le répertoire des articles, vous verrez le _index.md :
+
+```md
++++
+transparent = true
+redirect_to = "/"
++++
+```
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 = "/"
++++
+```