From cd770f70c0ebe769eb9b38b523958b390f228bcd Mon Sep 17 00:00:00 2001
From: Daniel Schwabeneder <daschw@disroot.org>
Date: Wed, 8 Aug 2018 09:24:37 +0200
Subject: [PATCH] fix merge conflict relicts

---
 src/output.jl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/output.jl b/src/output.jl
index 27592eb4..085876fb 100644
--- a/src/output.jl
+++ b/src/output.jl
@@ -254,7 +254,6 @@ end
 # end
 #
 # html_output_format("svg")
-<<<<<<< HEAD
 
 
 # ---------------------------------------------------------
@@ -279,5 +278,3 @@ function showjuno(io::IO, m, plt)
     plt[:dpi] = dpi
     plt[:thickness_scaling] = thickness_scaling
 end
-=======
->>>>>>> 85b3aefd677c8c3adf6797cb2d85c1249cf631b8