From e0093552eecbab1a2386076013cd2e598eeaaf65 Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Mon, 20 May 2019 08:55:47 +0200
Subject: [PATCH] #26 pydeps

---
 requirements_dev.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/requirements_dev.txt b/requirements_dev.txt
index 69a0332..4b288ce 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -19,10 +19,5 @@ matplotlib==3.0.2
 PyQt5==5.12
 Pillow==5.4.1
 
-<<<<<<< HEAD
-svgutils==0.3.1
-
-=======
 msgpack==0.6.1
 svgutils==0.3.1
->>>>>>> 19fac96634f312ac3c014c0517fad0c1fe273655
-- 
GitLab