Merge branch 'beta-rc1' into deploy-script

storyprotocol · Jan 26, 2024 · 35ae69d · 35ae69d
2 parents dd882bf + a25d031
commit 35ae69d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/contracts/interfaces/modules/ITaggingModule.sol b/contracts/interfaces/modules/ITaggingModule.sol
@@ -5,8 +5,4 @@ interface ITaggingModule {
     event TagSet(string tag, address ipId);
 
     event TagRemoved(string tag, address ipId);
-<<<<<<< Updated upstream
 }
-=======
-}
->>>>>>> Stashed changes