fix formatting

rdkcentral · Mar 21, 2024 · 8af8002 · 8af8002
1 parent 73231e9
commit 8af8002
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/core/sdk/src/api/device/device_apps.rs b/core/sdk/src/api/device/device_apps.rs
@@ -18,7 +18,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
+<<<<<<< HEAD
     api::app_catalog::AppMetadata,
+=======
+>>>>>>> 03be422 (fix formatting)
     api::session::AccountSession,
     extn::extn_client_message::{ExtnPayload, ExtnPayloadProvider, ExtnRequest},
     framework::ripple_contract::RippleContract,