headshed/infctl-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: merge issues

Browse source
This commit is contained in:
jon brookes 2025-08-20 15:58:33 +01:00
parent 268e1a136b
commit 5f347aec14
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vagrant/dev/ubuntu/Vagrantfile vendored
View file

@ -61,11 +61,7 @@ Vagrant.configure("2") do |config|
end end
vm2.vm.provider "virtualbox" do |vb| vm2.vm.provider "virtualbox" do |vb|
<<<<<<< HEAD
vb.memory = "4096" # 4GB memory
=======
vb.memory = "2048" # 4GB memory vb.memory = "2048" # 4GB memory
>>>>>>> 8396e72 (update: Added Longhorn installation process and updated memory allocation for VMs)
vb.cpus = 2 vb.cpus = 2
end end
@ -92,11 +88,7 @@ Vagrant.configure("2") do |config|
end end
vm3.vm.provider "virtualbox" do |vb| vm3.vm.provider "virtualbox" do |vb|
<<<<<<< HEAD
vb.memory = "4096" # 4GB memory
=======
vb.memory = "2048" # 4GB memory vb.memory = "2048" # 4GB memory
>>>>>>> 8396e72 (update: Added Longhorn installation process and updated memory allocation for VMs)
vb.cpus = 2 vb.cpus = 2
end end