resolve conflicts

vuestorefront · Oct 13, 2019 · 002d41b · 002d41b
1 parent b453de6
commit 002d41b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 1,867 deletions.
diff --git a/README.md b/README.md
@@ -831,53 +831,6 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
             height="40"
           >
         </a>
-</td>
-    </tr>
-    <tr>
-      <td align="center" valign="middle"> 
-<a href="https://www.helloevery1.com/">
-          <img
-            src="https://divante.com/partners/Vue-Storefront/every1-logo.png"
-            alt="every1"
-            height="40"
-          >
-        </a>
-</td>
-  <td align="center" valign="middle"> 
-<a href="">
-          <img
-            src=""
-            alt=""
-            height="40"
-          >
-        </a>
-</td>
-     <td align="center" valign="middle"> 
-<a href="">
-          <img
-            src=""
-            alt=""
-            height="40"
-          >
-        </a>
-</td>
-    <td align="center" valign="middle"> 
-<a href="">
-          <img
-            src=""
-            alt=""
-            height="40"
-          >
-        </a>
-</td>
-   <td align="center" valign="middle"> 
-<a href="">
-          <img
-            src=""
-            alt=""
-            height="40"
-          >
-        </a>
 </td>
     </tr>
   </tbody>

diff --git a/docs/guide/basics/configuration.md b/docs/guide/basics/configuration.md
@@ -14,8 +14,6 @@ Please take a look at the `node-config` docs as the library is open for some oth
 
 :::tip NOTE
 Currently, the configuration files are being processed by the webpack during the build process. This means that whenever you apply some configuration changes, you shall rebuild the app, even when using the `yarn dev` mode. This limitation can be solved with the VS 1.4 special config variable. Now the config can be reloaded on the fly with each server request if `config.server.dynamicConfigReload`is set to true. However, in that case, the config is added to `window.**INITIAL_STATE**` with the responses.
-
-When you using the `config.server.dynamicConfigReload` plase remember about `config.server.dynamicConfigExclude` and `config.server.dynamicConfigInclude`.
 :::
 
 Please find the configuration properties reference below.