Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
@Eole211
Eole211 committed May 27, 2019
1 parent e36c1b1 commit a6fe286
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down

0 comments on commit a6fe286

Please sign in to comment.