From 7345c6364a94a7589742b9287729c1b26dc78559 Mon Sep 17 00:00:00 2001
From: jerger <michael.jerger@meissa-gmbh.de>
Date: Sat, 18 Jun 2022 10:11:56 +0200
Subject: [PATCH] fix merge conflict

---
 project.clj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/project.clj b/project.clj
index af18b7a..32e923b 100644
--- a/project.clj
+++ b/project.clj
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-(defproject org.domaindrivenarchitecture/c4k-jitsi "1.2.1-SNAPSHOT"
-=======
 (defproject org.domaindrivenarchitecture/c4k-jitsi "1.2.2-SNAPSHOT"
->>>>>>> 3640427c743170831c0b9dcd6d6a6cec7f64eba1
   :description "jitsi c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"