X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=modules%2Flibjuju%2FVERSION;h=2cc4a7a752857284202bde2f4fb0d961e552420b;hp=a918a2aa18d5bec6a8bb93891a7a63c243111796;hb=f32b6f276457966347ed0d80ec7673ebc1357dc0;hpb=68858c1915122c2dbc8999a5cd3229694abf5f3a;ds=inline

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