Resolved merge conflicts (2)

This commit is contained in:
Orazio 2020-01-20 11:13:39 +01:00
commit 0999b0dd7c

View file

@ -571,7 +571,6 @@ avoidStaticIPv4Ubuntu() {
# If we are in Ubuntu then they need to have previously set their network, so just use what you have.
whiptail --msgbox --backtitle "IP Information" --title "IP Information" "Since we think you are not using Raspbian, we will not configure a static IP for you.
If you are in Amazon then you can not configure a static IP anyway. Just ensure before this installer started you had set an elastic IP on your instance." ${r} ${c}
}
validIP(){