Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
web-et-numerique
Factory
Resin
Server
Commits
ac18ce82
Commit
ac18ce82
authored
4 years ago
by
Hugo SUBTIL
Browse files
Options
Downloads
Patches
Plain Diff
fix: MR conflicts
parent
16666ccd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!38
Recette
,
!37
Dev
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/structures/services/structures.service.ts
+1
-1
1 addition, 1 deletion
src/structures/services/structures.service.ts
src/users/users.service.ts
+1
-1
1 addition, 1 deletion
src/users/users.service.ts
with
2 additions
and
2 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
