Merge branch 'master' of https://gitea.pellegq.com/mikepell/eve-ng

- update README.md

README.md

@@ -1,5 +1,6 @@
 Misc scripts for eve-ng.
 * listimages2 -- this will produce a listing of all images on the server that are currently in use in a lab.  Useful for cleaning up old versions of images.
 * Filebrowser role -- FileBrowser is a web-based upload and download tool.  This will allow web-based uploading of images to the eve-ng server as opposed to using SCP/WinSCP.  Uploading a folder with an image to the eve-ng server via this interface will automatically run the eve-ng commands (unl_wrapper -a fixpermissions) upon completion.
-  * apt install ansible sshpass
-  * ansible-playbook -i hosts filebrowser.yaml -kK
+    apt install ansible sshpass
+    ansible-playbook -i hosts filebrowser.yaml -kK
+* html/templates/intel -- a few custom templates

html/templates/intel/esxi.yml

@@ -40,4 +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