Fix main rebase

ThibsG · ThibsG · commit 90b3f7675f62 · 2022-08-20T18:13:03.000+02:00
diff --git a/tests/x.py b/tests/x.py
@@ -138,7 +138,6 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
                 tag=f"postgres_{version}" if runtime == "async-std" else f"postgres_{version}_{runtime}",
             )
 
-<<<<<<< HEAD
         ## +ssl
         for version in ["14", "13", "12", "11", "10"]:
             run(
@@ -149,8 +148,6 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data
                 tag=f"postgres_{version}_ssl" if runtime == "async-std" else f"postgres_{version}_ssl_{runtime}",
             )
 
-=======
->>>>>>> c85c4d2b (Add client ssl tests for MariaDB and MySQL)
         ## +client-ssl
         for version in ["14_client_ssl", "13_client_ssl", "12_client_ssl", "11_client_ssl", "10_client_ssl", "9_6_client_ssl"]:
             run(

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data`
`138`	`138`	`tag=f"postgres_{version}" if runtime == "async-std" else f"postgres_{version}_{runtime}",`
`139`	`139`	`)`
`140`	`140`
`141`		`-<<<<<<< HEAD`
`142`	`141`	`## +ssl`
`143`	`142`	`for version in ["14", "13", "12", "11", "10"]:`
`144`	`143`	`run(`
`@@ -149,8 +148,6 @@ def run(command, comment=None, env=None, service=None, tag=None, args=None, data`
`149`	`148`	`tag=f"postgres_{version}_ssl" if runtime == "async-std" else f"postgres_{version}_ssl_{runtime}",`
`150`	`149`	`)`
`151`	`150`
`152`		`-=======`
`153`		`->>>>>>> c85c4d2b (Add client ssl tests for MariaDB and MySQL)`
`154`	`151`	`## +client-ssl`
`155`	`152`	`for version in ["14_client_ssl", "13_client_ssl", "12_client_ssl", "11_client_ssl", "10_client_ssl", "9_6_client_ssl"]:`
`156`	`153`	`run(`