Skip to content

Commit c091864

Browse files
committed
fix missing conflict resolve
1 parent 86825e2 commit c091864

File tree

1 file changed

+0
-9
lines changed
  • src/ai/backend/manager/models

1 file changed

+0
-9
lines changed

src/ai/backend/manager/models/user.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,7 @@ class UserStatus(enum.StrEnum):
161161
),
162162
sa.Column("container_uid", sa.Integer, nullable=True, server_default=sa.null()),
163163
sa.Column("container_main_gid", sa.Integer, nullable=True, server_default=sa.null()),
164-
<<<<<<< HEAD
165164
sa.Column("container_gids", sa.ARRAY(sa.Integer), nullable=True, server_default=sa.null()),
166-
=======
167-
sa.Column(
168-
"container_supplementary_gids",
169-
sa.ARRAY(sa.Integer),
170-
nullable=True,
171-
server_default=sa.null(),
172-
),
173-
>>>>>>> 058c31fd4 (follow up replacing 'gids' to ('main_gid' and 'supplementary_gids'))
174165
)
175166

176167

0 commit comments

Comments
 (0)