X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=modules%2Flibjuju%2FVERSION;h=1a96df19c09af6513a57f1a11282a98d09da6167;hp=2cc4a7a752857284202bde2f4fb0d961e552420b;hb=f5b4b20b4ea114432a2096047262e874155b5c41;hpb=7b4702c2e118bab49def498b4b4c236d430dbc13

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