User parameters provided at instantiation time for Day-1 configuration mapping initia...

[osm/N2VC.git] / modules / libjuju / VERSION

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