X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=modules%2Flibjuju%2FVERSION;h=2cc4a7a752857284202bde2f4fb0d961e552420b;hb=c4f393e2cc27e8beb337d0058c11f7413f6639f6;hp=f38fc5393ff66e64aaa5d8733ea9b44d31927dce;hpb=c3e6c2ec9a1fddfc8e9bd31509b366e633b6d99e;p=osm%2FN2VC.git

diff --git a/modules/libjuju/VERSION b/modules/libjuju/VERSION
index f38fc53..2cc4a7a 100644
--- a/modules/libjuju/VERSION
+++ b/modules/libjuju/VERSION
@@ -1 +1,5 @@
+<<<<<<< HEAD
 0.7.3
+=======
+0.9.1
+>>>>>>> 8a2d5bc35a302a970244b3c307a4f47deac0af63