Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
holi-okuna
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
app
holi-okuna
Commits
f3e92fc2
Commit
f3e92fc2
authored
1 week ago
by
Gregor Schulz
Browse files
Options
Downloads
Patches
Plain Diff
merge conflicting migrations
parent
82cf9138
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
openbook_auth/migrations/0037_merge_20250326_1344.py
+13
-0
13 additions, 0 deletions
openbook_auth/migrations/0037_merge_20250326_1344.py
with
13 additions
and
0 deletions
openbook_auth/migrations/0037_merge_20250326_1344.py
0 → 100644
+
13
−
0
View file @
f3e92fc2
# Generated by Django 5.1.7 on 2025-03-26 12:44
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
"
openbook_auth
"
,
"
0036_merge_20250311_1255
"
),
(
"
openbook_auth
"
,
"
0036_rename_userprofile_id_user_openbook_au_id_773856_idx
"
),
]
operations
=
[]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment