Merge pull request 'fix: fixed merge error that somehow got missed' (#172 ) from fix/merge_error into master

Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/172
fix: fixed merge error that somehow got missed
2025-10-21 16:02:39 +00:00 · 2025-10-21 12:01:31 -04:00
1 changed files with 0 additions and 3 deletions
--- a/harmony/src/domain/interpret/mod.rs
+++ b/harmony/src/domain/interpret/mod.rs
@ -62,11 +62,8 @@ impl std::fmt::Display for InterpretName {
            InterpretName::Lamp => f.write_str("LAMP"),
            InterpretName::ApplicationMonitoring => f.write_str("ApplicationMonitoring"),
            InterpretName::K8sPrometheusCrdAlerting => f.write_str("K8sPrometheusCrdAlerting"),
-<<<<<<< HEAD
            InterpretName::CephRemoveOsd => f.write_str("CephRemoveOsd"),
-=======
            InterpretName::DiscoverInventoryAgent => f.write_str("DiscoverInventoryAgent"),
->>>>>>> origin/master
            InterpretName::CephClusterHealth => f.write_str("CephClusterHealth"),
            InterpretName::Custom(name) => f.write_str(name),
            InterpretName::RHOBAlerting => f.write_str("RHOBAlerting"),
Author	SHA1	Message	Date
wjro	7536f4ec4b	Merge pull request 'fix: fixed merge error that somehow got missed' (#172 ) from fix/merge_error into master Some checks are pending Run Check Script / check (push) Waiting to run Details Compile and package harmony_composer / package_harmony_composer (push) Waiting to run Details Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/172	2025-10-21 16:02:39 +00:00
Willem	464347d3e5	fix: fixed merge error that somehow got missed Some checks failed Run Check Script / check (pull_request) Has been cancelled Details	2025-10-21 12:01:31 -04:00