From 53eb2a8a35b30748c3c225f631aa5d0ca2dc93ab Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@ofthesun.net>
Date: Wed, 20 May 2020 08:40:57 +0200
Subject: [PATCH] Fixed typo in Dockerfile

(cherry picked from commit 6647c96bf94f88f5df1ce9b53f371752ad795b0d)

# Conflicts:
#	optional/radicale/Dockerfile
---
 optional/radicale/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile
index 289b9604..83a005d0 100644
--- a/optional/radicale/Dockerfile
+++ b/optional/radicale/Dockerfile
@@ -5,8 +5,12 @@
 FROM base
 =======
 RUN apk add --no-cache curl bash python3 \
+<<<<<<< HEAD
  && pip3 install radicale=2.1.12
 >>>>>>> 45f3772c (Stick radicale to 2.1.12 version)
+=======
+ && pip3 install radicale==2.1.12
+>>>>>>> 6647c96b (Fixed typo in Dockerfile)
 
 ARG VERSION=local
 LABEL version=$VERSION