ivanhao / pvetools

proxmox ve tools script(debian9+ can use it).Including email, samba, NFS set zfs max ram, nested virtualization ,docker , pci passthrough etc. for english user,please look the end of readme.
GNU General Public License v3.0
4.2k stars 512 forks source link

3329行有冲突代码没有解决,脚本错误了 #45

Closed hanshantao closed 2 years ago

hanshantao commented 2 years ago

如题

ggtony233 commented 2 years ago

雀食 line 3329: syntax error near unexpected token `<<<'

overXsky commented 2 years ago

the same ./pvetools.sh: line 3329: syntax error near unexpected token <<<' ./pvetools.sh: line 3329:<<<<<<< HEAD'

ivanhao commented 2 years ago

resolved.