From 5f347aec14ab78e99f5eea0140459c563e6a7350 Mon Sep 17 00:00:00 2001 From: jon brookes Date: Wed, 20 Aug 2025 15:58:33 +0100 Subject: [PATCH] fix: merge issues --- vagrant/dev/ubuntu/Vagrantfile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/vagrant/dev/ubuntu/Vagrantfile b/vagrant/dev/ubuntu/Vagrantfile index fa3f41c..6a3e7cd 100644 --- a/vagrant/dev/ubuntu/Vagrantfile +++ b/vagrant/dev/ubuntu/Vagrantfile @@ -61,11 +61,7 @@ Vagrant.configure("2") do |config| end vm2.vm.provider "virtualbox" do |vb| -<<<<<<< HEAD - vb.memory = "4096" # 4GB memory -======= vb.memory = "2048" # 4GB memory ->>>>>>> 8396e72 (update: Added Longhorn installation process and updated memory allocation for VMs) vb.cpus = 2 end @@ -92,11 +88,7 @@ Vagrant.configure("2") do |config| end vm3.vm.provider "virtualbox" do |vb| -<<<<<<< HEAD - vb.memory = "4096" # 4GB memory -======= vb.memory = "2048" # 4GB memory ->>>>>>> 8396e72 (update: Added Longhorn installation process and updated memory allocation for VMs) vb.cpus = 2 end