X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=modules%2Flibjuju%2FVERSION;h=2cc4a7a752857284202bde2f4fb0d961e552420b;hp=ee6cdce3c29053ac99607147be5be250efa001bd;hb=refs%2Fchanges%2F94%2F6394%2F1;hpb=1a15d1c84fc826fa7996c1c9d221a324edd33432

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