fix: docs

Signed-off-by: 0xRaccoon <[email protected]>
defi-wonderland · Dec 20, 2023 · 7cbc6fd · 7cbc6fd
1 parent dcfa5f4
commit 7cbc6fd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/solidity/interfaces/governance/utils/IWonderVotes.sol b/solidity/interfaces/governance/utils/IWonderVotes.sol
@@ -17,11 +17,7 @@ interface IWonderVotes {
   error VotesExpiredSignature(uint256 expiry);
 
   /**
-   * <<<<<<< HEAD
-   * @dev The weight delegation sum is different from totalWeight.
-   * =======
    * @dev The weight delegation sum is different from weightNormalizer.
-   * >>>>>>> c4a138a767bdf917be05f63ff44a3bb810d8b9db
    */
   error InvalidWeightSum(uint256 weightSum);