Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Chronos
Merge requests
!172
Fix conflicting migrations
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix conflicting migrations
fix-migration
into
release/2.0
Overview
0
Commits
1
Pipelines
1
Changes
1
Merged
Tom Teichler
requested to merge
fix-migration
into
release/2.0
3 years ago
Overview
0
Commits
1
Pipelines
1
Changes
1
Expand
0
0
Merge request reports
Viewing commit
539484ab
Show latest version
1 file
+
1
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Verified
539484ab
Fix conflicting migrations
· 539484ab
Tom Teichler
authored
3 years ago
aleksis/apps/chronos/migrations/000
7
_unique_constraints.py
→
aleksis/apps/chronos/migrations/000
8
_unique_constraints.py
+
1
−
1
Options
@@ -6,7 +6,7 @@ from django.db import migrations, models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
chronos
'
,
'
000
6_indexe
s
'
),
(
'
chronos
'
,
'
000
7_more_permission
s
'
),
]
operations
=
[
Loading