Fixing header tag in vagrant file

179e6b01 · Rowan Powell · 562b23ed · 179e6b01
Commit 179e6b01 authored 7 years ago by Rowan Powell
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -100,5 +100,4 @@ Vagrant.configure("2") do |config|
 	  end
  end
 
->>>>>>> a71470f1da6c7784e7b5cf15c9f589d2c010eac6
 end