logos-blockchain/logos-blockchain-testing
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-testing.git synced 2026-03-31 08:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(compose): remove committed conflict markers

Browse Source
This commit is contained in:
andrussal 2026-03-25 07:31:41 +01:00
parent 4fec05078f
commit 153f8d4e22
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing-framework/deployers/compose/src/deployer/orchestrator.rs
View File

@ -375,7 +375,6 @@ impl<E: ComposeDeployEnv> DeploymentOrchestrator<E> {
}
}
<<<<<<< HEAD
fn validate_supported_cluster_mode<E: Application, Caps>(
scenario: &Scenario<E, Caps>,
) -> Result<(), DynError> {
@ -425,8 +424,6 @@ mod tests {
);
}
}
=======
>>>>>>> 5baf93d (Align attach wording with existing-cluster mode)
fn existing_cluster_metadata<E, Caps>(scenario: &Scenario<E, Caps>) -> ComposeDeploymentMetadata
where
E: ComposeDeployEnv,