verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 93 Releases Wiki Activity

fix: solve conflicts from master to test #777

Merged
alexm merged 1 commits from mergeConflicts into test 2024-09-30 13:02:14 +00:00
Conversation 0 Commits 1 Files Changed 12 +86 -63
jsegarra commented 2024-09-30 13:00:27 +00:00
Member
Copy Link
No description provided.
jsegarra added 1 commit 2024-09-30 13:00:28 +00:00
gitea/salix-front/pipeline/pr-test This commit looks good Details
2302e22f11 fix: solve conflicts from master to test
jsegarra requested review from alexm 2024-09-30 13:00:30 +00:00
alexm approved these changes 2024-09-30 13:02:10 +00:00
alexm merged commit 35179695c3 into test 2024-09-30 13:02:14 +00:00
alexm deleted branch mergeConflicts 2024-09-30 13:02:14 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexm
Labels
Clear labels   
bug

Something is not working

  
CR / Tests passed

CR / Tests passed

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
invalid

Something is wrong

  
Missing Tests

Missing Tests

  
wontfix

This won't be fixed

No Label
bug
CR / Tests passed
duplicate
enhancement
invalid
Missing Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#777
No description provided.
Delete Branch "mergeConflicts"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?