fix merge conflict

2 years ago · 7345c6364a
parent 911093eb7e
commit 7345c6364a
1 changed files with 0 additions and 4 deletions
--- 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"