From c83639a47ff925960fbce26715a02d910348d300 Mon Sep 17 00:00:00 2001
From: vincent <vincent@ducamps.win>
Date: Tue, 7 Jan 2020 22:18:05 +0100
Subject: [PATCH] merge

---
 backend/requirements.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/requirements.txt b/backend/requirements.txt
index a961bb0..1f678f0 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -16,10 +16,6 @@ pylint==2.3.1
 six==1.12.0
 soupsieve==1.9.1
 typed-ast==1.4.0
-<<<<<<< HEAD
 Werkzeug==0.16.0
-=======
-Werkzeug==0.15.2
->>>>>>> db15ccff764e95704cb9be68ecbdbad36f97ac5c
 wrapt==1.11.1