Fix broken readme due to rebase mistake

78c365fc · Jan-Philipp Stauffert · 98335522 · 78c365fc
Commit 78c365fc authored Sep 13, 2018 by Jan-Philipp Stauffert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

readme.md readme.md +0 -3

No files found.
--- a/readme.md
+++ b/readme.md
@@ -38,12 +38,9 @@ Decker uses a few external tools that need to be installed on the system:
 -   [*pdf2svg*](https://github.com/dawbarton/pdf2svg) to generate SVG files from
    PDF documents
 -   [*sassc*](https://github.com/sass/sassc) to compile SCSS to CSS
-<<<<<<< HEAD
 -   *libbzip2-dev*
-=======
 -   [*NodeJS*](https://nodejs.org/) as a prerequisite for Yarn
 -   [*Yarn*](https://yarnpkg.com) to install Javascript dependencies
->>>>>>> 7ac005b... Add menu plugin to the deck template

 ### Installation of external tools on macOS