[PR #7164] [MERGED] Fix merge conflict #22091

New Issue

Closed

opened 2026-04-30 08:25:23 -05:00 by GiteaMirror · 0 comments

GiteaMirror commented 2026-04-30 08:25:23 -05:00

Owner

Copy Link

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/7164
Author: @dani-garcia
Created: 4/29/2026
Status: ✅ Merged
Merged: 4/29/2026
Merged by: @dani-garcia

Base: main ← Head: fix-merge-conflict

---

📝 Commits (1)

• 0a4d5d4 Fix merge conflict

📊 Changes

1 file changed (+2 additions, -2 deletions)

View changed files

📝 src/api/core/ciphers.rs (+2 -2)

📄 Description

Fix a compilation error due to a conflict between two merged PRs

---

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/7164 **Author:** [@dani-garcia](https://github.com/dani-garcia) **Created:** 4/29/2026 **Status:** ✅ Merged **Merged:** 4/29/2026 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `fix-merge-conflict` --- ### 📝 Commits (1) - [`0a4d5d4`](https://github.com/dani-garcia/vaultwarden/commit/0a4d5d4f3da3c62e779afe49de62c4a7c75d96c3) Fix merge conflict ### 📊 Changes **1 file changed** (+2 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `src/api/core/ciphers.rs` (+2 -2) </details> ### 📄 Description Fix a compilation error due to a conflict between two merged PRs --- _{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

GiteaMirror added the pull-request label 2026-04-30 08:25:23 -05:00

GiteaMirror closed this issue 2026-04-30 08:25:24 -05:00

Sign in to join this conversation.

No Branch/Tag Specified

Branches Tags

main

revert-7033-patch-1

cached-config-operations

test_dylint

1.36.0

1.35.8

1.35.7

1.35.6

1.35.5

1.35.4

1.35.3

1.35.2

1.35.1

1.35.0

1.34.3

1.34.2

1.34.1

1.34.0

1.33.2

1.33.1

1.33.0

1.32.7

1.32.6

1.32.5

1.32.4

1.32.3

1.32.2

1.32.1

1.32.0

1.31.0

1.30.5

1.30.4

1.30.3

1.30.2

1.30.1

1.30.0

1.29.2

1.29.1

1.29.0

1.28.1

1.28.0

1.27.0

1.26.0

1.25.2

1.25.1

1.25.0

1.24.0

1.23.1

1.23.0

1.22.2

1.22.1

1.22.0

1.21.0

1.20.0

1.19.0

1.18.0

1.17.0

1.16.3

1.16.2

1.16.1

1.16.0

1.15.1

1.15.0

1.14.2

1.14.1

1.14

1.13.1

1.13.0

1.12.0

1.11.0

1.10.0

1.9.1

1.9.0

1.8.0

1.7.0

1.6.1

1.6.0

1.5.0

1.4.0

1.3.0

1.2.0

1.1.0

1.0.0

0.13.0

0.12.0

0.11.0

0.10.0

0.9.0

Labels

Clear labels

better for forum

bug

documentation

duplicate

enhancement

future Vault

good first issue

help wanted

low priority

notes

pull-request

Mirrored from GitHub Pull Request

question

SSO

Third party

troubleshooting

wontfix

No Label pull-request

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

GiteaMirror ninjasurge

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#22091