From 0dda59d0b0041824175d47d2b2604990c00fac21 Mon Sep 17 00:00:00 2001 From: mubarak23 Date: Sun, 6 Oct 2024 11:42:35 +0100 Subject: [PATCH] chore: fix merge conflict from main --- src/base/constants/types.cairo | 16 ---------------- src/interfaces.cairo | 2 -- 2 files changed, 18 deletions(-) diff --git a/src/base/constants/types.cairo b/src/base/constants/types.cairo index fc09376..47679e2 100644 --- a/src/base/constants/types.cairo +++ b/src/base/constants/types.cairo @@ -3,22 +3,6 @@ // ************************************************************************* use starknet::ContractAddress; -// /** -// * @notice A struct containing token follow-related data. -// * -// * @param followed_profile_address The ID of the profile being followed. -// * @param follower_profile_address The ID of the profile following. -// * @param followTimestamp The timestamp of the current follow, if a profile is using the token to -// follow. -// * @param block_status true if follower is blocked, false otherwise -// */ -#[derive(Drop, Serde, starknet::Store)] -pub struct FollowData { - pub followed_profile_address: ContractAddress, - pub follower_profile_address: ContractAddress, - pub follow_timestamp: u64, - pub block_status: bool, -} // * @notice A struct containing profile data. // * profile_address The profile ID of a karst profile diff --git a/src/interfaces.cairo b/src/interfaces.cairo index 7eadf74..abf4891 100644 --- a/src/interfaces.cairo +++ b/src/interfaces.cairo @@ -11,8 +11,6 @@ pub mod IHub; pub mod ICommunity; pub mod ICollectNFT; pub mod ICommunityNft; - pub mod IJolt; -pub mod ICollectNFT; pub mod IUpgradeable;