From a6fe28699a963bb01aff8a8b694affa2bdc275ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Demicheli?= Date: Mon, 27 May 2019 10:57:22 +0200 Subject: [PATCH] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index beb66d8..505dc79 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,7 @@ 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`