meissa/c4k-jitsi
6
0
Fork 0
Code Issues Pull requests Projects Releases 11 Packages Wiki Activity

fix merge conflict

Browse source
This commit is contained in:
jerger 2022-06-18 10:11:56 +02:00
parent 911093eb7e
commit 7345c6364a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
project.clj
View file

@ -1,8 +1,4 @@
<<<<<<< HEAD
(defproject org.domaindrivenarchitecture/c4k-jitsi "1.2.1-SNAPSHOT"
=======
(defproject org.domaindrivenarchitecture/c4k-jitsi "1.2.2-SNAPSHOT" (defproject org.domaindrivenarchitecture/c4k-jitsi "1.2.2-SNAPSHOT"
>>>>>>> 3640427c743170831c0b9dcd6d6a6cec7f64eba1
:description "jitsi c4k-installation package" :description "jitsi c4k-installation package"
:url "https://domaindrivenarchitecture.org" :url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0" :license {:name "Apache License, Version 2.0"