Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
desd
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
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
kj2-drupisz
desd
Commits
a95c92f0
Commit
a95c92f0
authored
1 year ago
by
James Smith
Browse files
Options
Downloads
Patches
Plain Diff
fixing merge issues
parent
573d3c04
No related branches found
No related tags found
1 merge request
!18
fixing merge issues
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
myproject/debug.log
+14
-0
14 additions, 0 deletions
myproject/debug.log
myproject/myapp/forms.py
+0
-1
0 additions, 1 deletion
myproject/myapp/forms.py
myproject/myapp/urls.py
+1
-3
1 addition, 3 deletions
myproject/myapp/urls.py
myproject/requirements.txt
+0
-2
0 additions, 2 deletions
myproject/requirements.txt
with
15 additions
and
6 deletions
Loading
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
