From 54118947e536320f92acb40e67482340dd9d6418 Mon Sep 17 00:00:00 2001
From: saini-g <saini.gaurav2205@gmail.com>
Date: Sat, 30 May 2020 16:37:46 +0530
Subject: [PATCH] resolved merge conflict

---
 src/blocks/footer/dark/d.js  | 2 +-
 src/blocks/footer/dark/e.js  | 2 +-
 src/blocks/footer/light/d.js | 2 +-
 src/blocks/footer/light/e.js | 2 +-
 src/blocks/header/dark/d.js  | 2 +-
 src/blocks/header/light/a.js | 2 +-
 src/blocks/header/light/b.js | 2 +-
 src/blocks/header/light/c.js | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/blocks/footer/dark/d.js b/src/blocks/footer/dark/d.js
index 5f2465a..2cf4796 100644
--- a/src/blocks/footer/dark/d.js
+++ b/src/blocks/footer/dark/d.js
@@ -18,7 +18,7 @@ function DarkFooterD(props) {
           >
             <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
           </svg>
-          <span className="ml-3 text-xl">madde</span>
+          <span className="ml-3 text-xl">tailblocks</span>
         </a>
         <p className="text-sm text-gray-600 sm:ml-4 sm:pl-4 sm:border-l-2 sm:border-gray-800 sm:py-2 sm:mt-0 mt-4">
           © 2020 madde —
diff --git a/src/blocks/footer/dark/e.js b/src/blocks/footer/dark/e.js
index cce42c0..96f3fc2 100644
--- a/src/blocks/footer/dark/e.js
+++ b/src/blocks/footer/dark/e.js
@@ -108,7 +108,7 @@ function DarkFooterE(props) {
             >
               <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
             </svg>
-            <span className="ml-3 text-xl">madde</span>
+            <span className="ml-3 text-xl">tailblocks</span>
           </a>
           <p className="text-sm text-gray-600 sm:ml-6 sm:mt-0 mt-4">
             © 2020 madde —
diff --git a/src/blocks/footer/light/d.js b/src/blocks/footer/light/d.js
index ee5eef8..086a293 100644
--- a/src/blocks/footer/light/d.js
+++ b/src/blocks/footer/light/d.js
@@ -18,7 +18,7 @@ function LightFooterD(props) {
           >
             <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
           </svg>
-          <span className="ml-3 text-xl">madde</span>
+          <span className="ml-3 text-xl">tailblocks</span>
         </a>
         <p className="text-sm text-gray-500 sm:ml-4 sm:pl-4 sm:border-l-2 sm:border-gray-200 sm:py-2 sm:mt-0 mt-4">
           © 2020 madde —
diff --git a/src/blocks/footer/light/e.js b/src/blocks/footer/light/e.js
index c28ef78..ed33789 100644
--- a/src/blocks/footer/light/e.js
+++ b/src/blocks/footer/light/e.js
@@ -108,7 +108,7 @@ function LightFooterE(props) {
             >
               <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
             </svg>
-            <span className="ml-3 text-xl">madde</span>
+            <span className="ml-3 text-xl">tailblocks</span>
           </a>
           <p className="text-sm text-gray-500 sm:ml-6 sm:mt-0 mt-4">
             © 2020 madde —
diff --git a/src/blocks/header/dark/d.js b/src/blocks/header/dark/d.js
index 6fa7055..45370f2 100644
--- a/src/blocks/header/dark/d.js
+++ b/src/blocks/header/dark/d.js
@@ -18,7 +18,7 @@ function DarkHeaderD(props) {
           >
             <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
           </svg>
-          <span className="ml-3 text-xl">madde</span>
+          <span className="ml-3 text-xl">tailblocks</span>
         </a>
         <nav className="md:ml-auto md:mr-auto flex flex-wrap items-center text-base justify-center">
           <a href className="mr-5 hover:text-white">First Link</a>
diff --git a/src/blocks/header/light/a.js b/src/blocks/header/light/a.js
index 7fd912e..e852abf 100644
--- a/src/blocks/header/light/a.js
+++ b/src/blocks/header/light/a.js
@@ -18,7 +18,7 @@ function LightHeaderA(props) {
           >
             <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
           </svg>
-          <span className="ml-3 text-xl">madde</span>
+          <span className="ml-3 text-xl">tailblocks</span>
         </a>
         <nav className="md:ml-auto flex flex-wrap items-center text-base justify-center">
           <a href className="mr-5 hover:text-gray-900">First Link</a>
diff --git a/src/blocks/header/light/b.js b/src/blocks/header/light/b.js
index 2e5bbb7..1edf6a2 100644
--- a/src/blocks/header/light/b.js
+++ b/src/blocks/header/light/b.js
@@ -18,7 +18,7 @@ function LightHeaderB(props) {
           >
             <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
           </svg>
-          <span className="ml-3 text-xl">madde</span>
+          <span className="ml-3 text-xl">tailblocks</span>
         </a>
         <nav className="md:mr-auto md:ml-4 md:py-1 md:pl-4 md:border-l md:border-gray-400	flex flex-wrap items-center text-base justify-center">
           <a href className="mr-5 hover:text-gray-900">First Link</a>
diff --git a/src/blocks/header/light/c.js b/src/blocks/header/light/c.js
index e65cceb..7a99481 100644
--- a/src/blocks/header/light/c.js
+++ b/src/blocks/header/light/c.js
@@ -24,7 +24,7 @@ function LightHeaderC(props) {
           >
             <path d="M12 2L2 7l10 5 10-5-10-5zM2 17l10 5 10-5M2 12l10 5 10-5" />
           </svg>
-          <span className="ml-3 text-xl">madde</span>
+          <span className="ml-3 text-xl">tailblocks</span>
         </a>
         <div className="lg:w-2/5 inline-flex lg:justify-end ml-5 lg:ml-0">
           <button className="inline-flex items-center bg-gray-200 border-0 py-1 px-3 focus:outline-none hover:bg-gray-300 rounded text-base mt-4 md:mt-0">