socsvn commit: r305036 - in soc2016/litong/vagrant-bhyve/trunk: . bin lib/vagrant-bhyve spec/vagrant

[litong at FreeBSD.org]

Author: litong
Date: Fri Jun 10 12:35:48 2016
New Revision: 305036
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305036

Log:
  remove bin

Deleted:
  soc2016/litong/vagrant-bhyve/trunk/bin/console
  soc2016/litong/vagrant-bhyve/trunk/bin/setup
  soc2016/litong/vagrant-bhyve/trunk/spec/vagrant/bhyve_spec.rb
Modified:
  soc2016/litong/vagrant-bhyve/trunk/.gitignore
  soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb

Modified: soc2016/litong/vagrant-bhyve/trunk/.gitignore
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/.gitignore	Fri Jun 10 12:35:09 2016	(r305035)
+++ soc2016/litong/vagrant-bhyve/trunk/.gitignore	Fri Jun 10 12:35:48 2016	(r305036)
@@ -7,7 +7,11 @@
 /pkg/
 /spec/reports/
 /tmp/
+<<<<<<< f0976cd4b81347c0d687988ff6463d3113e547d2
 <<<<<<< 8569ecf8bd116d9e214f6907f29993bd8e03d40d
 /svn-commit.tmp
 =======
 >>>>>>> Initial commit
+=======
+/svn-commit.tmp
+>>>>>>> remove bin

Modified: soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb
==============================================================================
--- soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb	Fri Jun 10 12:35:09 2016	(r305035)
+++ soc2016/litong/vagrant-bhyve/trunk/lib/vagrant-bhyve/version.rb	Fri Jun 10 12:35:48 2016	(r305036)
@@ -1,8 +1,12 @@
+<<<<<<< f0976cd4b81347c0d687988ff6463d3113e547d2
 <<<<<<< 8569ecf8bd116d9e214f6907f29993bd8e03d40d
 module VagrantPlugins
 =======
 module Vagrant
 >>>>>>> Initial commit
+=======
+module VagrantPlugins
+>>>>>>> remove bin
   module Bhyve
     VERSION = "0.1.0"
   end