From c054c817f95f72c62d022ecd7e483d5ef1dcb0d9 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <kristian.haugene@greenbird.com>
Date: Sun, 2 Feb 2020 20:19:03 +0100
Subject: [PATCH] Fix merge error

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dc0bc0fa4..c208cc2cc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -193,8 +193,6 @@ commands:
 
             if [ "<< parameters.distro >>" = "ubuntu" ]; then
               TAG_DISTRO="";
-            if [ "<< parameters.distro >>" = "ubuntu" ]; then 
-              TAG_DISTRO=""; 
             else
               TAG_DISTRO=-<< parameters.distro >>;
             fi