fix: merge issues
This commit is contained in:
parent
268e1a136b
commit
9434d70ac8
1 changed files with 0 additions and 8 deletions
8
vagrant/dev/ubuntu/Vagrantfile
vendored
8
vagrant/dev/ubuntu/Vagrantfile
vendored
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue