[PORTAL-7] code rebase

Change-Id: I2c9a6720f773335275b5c04607e5615c1f645670
Signed-off-by: Manoop Talasila <talasila@research.att.com>

diff --git a/version.properties b/version.properties
index 7f86aa1..fa08032 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,7 @@
 # Versioning variables
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
+#
 
 major=1
 minor=1