Merge branch 'master' of https://gitea.pellegq.com/mikepell/eve-ng
This commit is contained in:
@@ -40,3 +40,7 @@ qemu_version: 4.1.0
|
||||
qemu_options: -machine pc,accel=kvm -serial none -nographic -no-user-config -nodefaults
|
||||
-display none -vga std -rtc base=utc -cpu host
|
||||
...
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> f507fee7efbfaeeb0fbb6ff339f1497ed0839eed
|
||||
|
||||
Reference in New Issue
Block a user