diff --git a/Vagrantfile b/Vagrantfile
index a38600d3d6619e996dba8e279526fb7cfc65bb49..af4f48eff85d03a80008394eaa6b5ca9adcf784c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -100,5 +100,4 @@ Vagrant.configure("2") do |config|
 	  end
   end
  
->>>>>>> a71470f1da6c7784e7b5cf15c9f589d2c010eac6
 end