revert 3d changes merged in this project

BobRazowsky · May 27, 2019 · e36c1b1 · e36c1b1
1 parent de791fe
commit e36c1b1
Show file tree

Hide file tree

Showing 2 changed files with 1,495 additions and 1,666 deletions.
diff --git a/README.md b/README.md
@@ -5,9 +5,17 @@ specific (private) configuration for deployment & caas.
 
 Please do not submit merge requests or open issues here if not linked to Wanadev
 infrastructure.
+<<<<<<< HEAD
 
 Upstream repository url: `git@github.com:wanadev/obsidianjs-starter.git`
+=======
+>>>>>>> parent of 577a636... es6 modules and readme update
 
+Upstream repository url: `git@github.com:wanadev/obsidianjs-starter.git`
+
+```
+npm install
+```
 ---
 
 ## Useful links :
@@ -16,6 +24,13 @@ Upstream repository url: `git@github.com:wanadev/obsidianjs-starter.git`
 
 ---
 
+### Auto creating module
+
+```
+npm run plop
+```
+
+
 # obsidian starter
 
 ## Usage