From abc4b433abe9b7085f876f4b3bbb57e81d24b60f Mon Sep 17 00:00:00 2001
From: Naomi Plasterer <naomi@xmtp.com>
Date: Mon, 29 Apr 2024 17:35:09 -0700
Subject: [PATCH] fix up a few merge conflicts

---
 openmls/src/group/errors.rs           | 6 +++---
 openmls/src/group/mls_group/errors.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openmls/src/group/errors.rs b/openmls/src/group/errors.rs
index c6eb6ae3c..50e2e8317 100644
--- a/openmls/src/group/errors.rs
+++ b/openmls/src/group/errors.rs
@@ -500,7 +500,7 @@ pub(crate) enum CoreGroupParseMessageError {
 
 /// Create group context ext proposal error
 #[derive(Error, Debug, PartialEq, Clone)]
-pub enum CreateGroupContextExtProposalError<KeyStoreError> {
+pub enum CreateGroupContextExtProposalError<StorageError> {
     /// See [`LibraryError`] for more details.
     #[error(transparent)]
     LibraryError(#[from] LibraryError),
@@ -515,10 +515,10 @@ pub enum CreateGroupContextExtProposalError<KeyStoreError> {
     LeafNodeValidation(#[from] LeafNodeValidationError),
     /// See [`MlsGroupStateError`] for more details.
     #[error(transparent)]
-    MlsGroupStateError(#[from] MlsGroupStateError),
+    MlsGroupStateError(#[from] MlsGroupStateError<StorageError>),
     /// See [`CreateCommitError`] for more details.
     #[error(transparent)]
-    CreateCommitError(#[from] CreateCommitError<KeyStoreError>),
+    CreateCommitError(#[from] CreateCommitError<StorageError>),
 }
 
 /// Error merging a commit.
diff --git a/openmls/src/group/mls_group/errors.rs b/openmls/src/group/mls_group/errors.rs
index b260b4944..abf94bdbe 100644
--- a/openmls/src/group/mls_group/errors.rs
+++ b/openmls/src/group/mls_group/errors.rs
@@ -340,7 +340,7 @@ pub enum ProposalError<StorageError> {
     ValidationError(#[from] ValidationError),
     /// See [`CreateGroupContextExtProposalError`] for more details.
     #[error(transparent)]
-    CreateGroupContextExtProposalError(#[from] CreateGroupContextExtProposalError),
+    CreateGroupContextExtProposalError(#[from] CreateGroupContextExtProposalError<StorageError>),
     /// Error writing proposal to storage.
     #[error("error writing proposal to storage")]
     StorageError(StorageError),