vmc 0.3.13.beta.3 → 0.3.13.beta.4

data/lib/cli/commands/user.rb

@@ -13,17 +13,12 @@ module VMC::Cli::Command
       email    = @options[:email] unless email
       password = @options[:password]
       tries ||= 0
-<<<<<<< HEAD
-      email = ask("Email: ") unless no_prompt || email
-      password = ask("Password: ") {|q| q.echo = '*'} unless no_prompt || password
-=======
 
       unless no_prompt
         email ||= ask("Email")
         password ||= ask("Password", :echo => "*")
       end
 
->>>>>>> local-staging/master
       err "Need a valid email" unless email
       err "Need a password" unless password
       login_and_save_token(email, password)

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.13.beta.3'
+    VERSION = '0.3.13.beta.4'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: vmc
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.3.13.beta.3
+  version: 0.3.13.beta.4
 platform: ruby
 authors: 
 - VMware