8000 Rebase to master - fix merge conflict in one file that was missed · gurjeet/postgres@57060f4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 57060f4

Browse files
gurjeetgurjeet
committed
Rebase to master - fix merge conflict in one file that was missed
1 parent 0052d01 commit 57060f4

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

‎src/include/catalog/pg_authid.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,9 @@ CATALOG(pg_authid,1260,AuthIdRelationId) BKI_SHARED_RELATION BKI_ROWTYPE_OID(284
5454
*/
5555
typedef FormData_pg_authid *Form_pg_authid;
5656

57-
<<<<<<< HEAD
5857
DECLARE_TOAST_WITH_MACRO(pg_authid, 4175, 4176, PgAuthidToastTable, PgAuthidToastIndex);
5958

6059
DECLARE_UNIQUE_INDEX(pg_authid_rolname_index, 2676, AuthIdRolnameIndexId, pg_authid, btree(rolname name_ops));
6160
DECLARE_UNIQUE_INDEX_PKEY(pg_authid_oid_index, 2677, AuthIdOidIndexId, pg_authid, btree(oid oid_ops));
62-
=======
63-
DECLARE_UNIQUE_INDEX(pg_authid_rolname_index, 2676, AuthIdRolnameIndexId, on pg_authid using btree(rolname name_ops));
64-
DECLARE_UNIQUE_INDEX_PKEY(pg_authid_oid_index, 2677, AuthIdOidIndexId, on pg_authid using btree(oid oid_ops));
65-
>>>>>>> 9d551e8e76 (Patch v3)
6661

6762
#endif /* PG_AUTHID_H */

0 commit comments

Comments
 (0)
0