projects / osm / N2VC.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Improved Primitive support and better testing
[osm/N2VC.git] / modules / libjuju / VERSION
diff --git a/modules/libjuju/VERSION b/modules/libjuju/VERSION
index ee6cdce..2cc4a7a 100644 (file)
--- a/modules/libjuju/VERSION
+++ b/modules/libjuju/VERSION
@@ -1 +1,5 @@
-0.6.1
+<<<<<<< HEAD
+0.7.3
+=======
+0.9.1
+>>>>>>> 8a2d5bc35a302a970244b3c307a4f47deac0af63