From 179e6b01bc120cab80c8dad37c61a8e1e4c90814 Mon Sep 17 00:00:00 2001
From: Rowan Powell <rp17@it-innovation.soton.ac.uk>
Date: Thu, 15 Feb 2018 13:59:03 +0000
Subject: [PATCH] Fixing header tag in vagrant file

---
 Vagrantfile | 1 -
 1 file changed, 1 deletion(-)

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