From e0bc510bdcd165d4d3079c16c720465e60f2c369 Mon Sep 17 00:00:00 2001
From: saadnpq <saadnpq@localhost.localdomain>
Date: Fri, 15 May 2020 22:35:56 +0200
Subject: try to manually fix conflicts with #2

---
 config.toml         | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 example-config.toml | 51 ---------------------------------------------------
 2 files changed, 51 insertions(+), 51 deletions(-)
 create mode 100644 config.toml
 delete mode 100644 example-config.toml

diff --git a/config.toml b/config.toml
new file mode 100644
index 0000000..820aaf5
--- /dev/null
+++ b/config.toml
@@ -0,0 +1,51 @@
+baseURL = "https://www.example.com"
+languageCode = "en-us"
+title = "title"
+copyright = "Copyright © 2008–2019, Steve Francia and the Hugo Authors; all rights reserved."
+theme = "npq-hugo"
+pygmentsUseClasses=true
+
+[params]
+  author = "your name"
+  description = "your description"
+  keywords = "hugo blog"
+  useAvatar = true
+  microBlogSection = "posts"
+  displayMicroBlog = false
+  displayRecent = true
+  recentMax = 4
+  mail = "mail@example.com"
+  phone = "8888888888"
+  formspreeID = "yourformspreeID"
+
+[menu]
+  [[menu.main]]
+    name = "home"
+    pre = "<i class=\"fas fa-home fa-sm\"></i>"
+    url = "/"
+    weight = -9 
+  [[menu.main]]
+    name = "blog"
+    pre = "<i class=\"fas fa-keyboard fa-ms\"></i>"
+    url = "/blog/"
+    weight = -8
+  [[menu.main]]
+    name = "tags"
+    pre = "<i class=\"fas fa-tags fa-ms\"></i>"
+    url = "/tags"
+    weight = -7 
+  [[menu.main]]
+    name = "github"
+    pre = "<i class=\"fab fa-github fa-ms\"></i>"
+    url = "https://github.com/yourgithubusername23434"
+    weight = -6 
+  [[menu.main]]
+    name = "RSS"
+    pre = "<i class=\"fas fa-rss fa-ms\"></i>"
+    url = "/index.xml"
+    weight = -4 
+  [[menu.main]]
+    name = "contact"
+    pre = "<i class=\"far fa-envelope\"></i>"
+    url = "/contact"
+    weight = -1 
diff --git a/example-config.toml b/example-config.toml
deleted file mode 100644
index 820aaf5..0000000
--- a/example-config.toml
+++ /dev/null
@@ -1,51 +0,0 @@
-baseURL = "https://www.example.com"
-languageCode = "en-us"
-title = "title"
-copyright = "Copyright © 2008–2019, Steve Francia and the Hugo Authors; all rights reserved."
-theme = "npq-hugo"
-pygmentsUseClasses=true
-
-[params]
-  author = "your name"
-  description = "your description"
-  keywords = "hugo blog"
-  useAvatar = true
-  microBlogSection = "posts"
-  displayMicroBlog = false
-  displayRecent = true
-  recentMax = 4
-  mail = "mail@example.com"
-  phone = "8888888888"
-  formspreeID = "yourformspreeID"
-
-[menu]
-  [[menu.main]]
-    name = "home"
-    pre = "<i class=\"fas fa-home fa-sm\"></i>"
-    url = "/"
-    weight = -9 
-  [[menu.main]]
-    name = "blog"
-    pre = "<i class=\"fas fa-keyboard fa-ms\"></i>"
-    url = "/blog/"
-    weight = -8
-  [[menu.main]]
-    name = "tags"
-    pre = "<i class=\"fas fa-tags fa-ms\"></i>"
-    url = "/tags"
-    weight = -7 
-  [[menu.main]]
-    name = "github"
-    pre = "<i class=\"fab fa-github fa-ms\"></i>"
-    url = "https://github.com/yourgithubusername23434"
-    weight = -6 
-  [[menu.main]]
-    name = "RSS"
-    pre = "<i class=\"fas fa-rss fa-ms\"></i>"
-    url = "/index.xml"
-    weight = -4 
-  [[menu.main]]
-    name = "contact"
-    pre = "<i class=\"far fa-envelope\"></i>"
-    url = "/contact"
-    weight = -1 
-- 
cgit v1.2.3