solve conflicts with ubuntu 20 branch

This commit is contained in:
Rauno Moisto
2021-07-13 14:47:20 +03:00
parent 4cb46ea465
commit 03fe2df0a6
12 changed files with 68 additions and 70 deletions
+1 -1
View File
@@ -7,6 +7,6 @@
## your own --- please do not ask for help from us.
upstream php-fpm {
server unix:/var/run/php/php7.2-fpm.sock;
server unix:/var/run/php/php7.4-fpm.sock;
}