Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SystemDev_HRProject
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
Tran15.Anh@live.uwe.ac.uk
SystemDev_HRProject
Commits
e5ee9dd3
Commit
e5ee9dd3
authored
2 months ago
by
duyanhehe
Browse files
Options
Downloads
Patches
Plain Diff
fix conflict
parent
f5bd1d9f
Loading
Loading
Loading
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/__init__.py
+1
-5
1 addition, 5 deletions
app/__init__.py
app/templates/inventory/manage_inventory.html
+0
-42
0 additions, 42 deletions
app/templates/inventory/manage_inventory.html
with
1 addition
and
47 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
