fix: fixed conflicts when updating from upstream

Author: victoraugustolls

internal/endtoend/testdata/func_return/posgresql/pgx/go/query.sql.go

@@ -1,3 +1,4 @@
+
 /* name: GetUsers :many */
 SELECT *
 FROM users_func()
@@ -6,4 +7,4 @@ WHERE first_name != '';
 /* name: GenerateSeries :many */
 SELECT ($1::inet) + i
 FROM generate_series(0, $2::int) AS i
-LIMIT 1;
+LIMIT 1;

internal/endtoend/testdata/func_return/posgresql/pgx/query.sql

@@ -1,4 +1,10 @@
+
 /* name: GetUsers :many */
 SELECT *
 FROM users_func()
 WHERE first_name != '';
+
+/* name: GenerateSeries :many */
+SELECT ($1::inet) + i
+FROM generate_series(0, $2::int) AS i
+LIMIT 1;

internal/endtoend/testdata/func_return/posgresql/stdlib/query.sql

@@ -1,9 +1,9 @@
 CREATE TABLE users (
-    id integer,
-    first_name varchar(255) NOT NULL
+   id integer,
+   first_name varchar(255) NOT NULL
 );
 
 CREATE FUNCTION users_func() RETURNS SETOF users AS $func$ BEGIN QUERY
 SELECT *
 FROM users
-END $func$ LANGUAGE plpgsql;
+END $func$ LANGUAGE plpgsql;