chore: format

Author: ypatil12

src/contracts/core/StrategyManager.sol

@@ -210,7 +210,11 @@ contract StrategyManager is
     }
 
     /// @inheritdoc IStrategyManager
-    function decreaseBurnableShares(OperatorSet calldata operatorSet, uint256 slashId, uint256 index) public returns (uint256) {
+    function decreaseBurnableShares(
+        OperatorSet calldata operatorSet,
+        uint256 slashId,
+        uint256 index
+    ) public returns (uint256) {
         EnumerableMap.AddressToUintMap storage operatorSetBurnableShares =
             _operatorSetBurnableShares[operatorSet.key()][slashId];
 

src/contracts/interfaces/IStrategyManager.sol

@@ -148,7 +148,11 @@ interface IStrategyManager is IStrategyManagerErrors, IStrategyManagerEvents, IS
      * @param slashId The slash ID to burn shares in.
      * @param index The index of the strategy to burn shares in. Returns the amount of shares that were burned.
      */
+<<<<<<< HEAD
     function decreaseBurnOrRedistributableShares(
+=======
+    function decreaseBurnableShares(
+>>>>>>> b227d922 (chore: format)
         OperatorSet calldata operatorSet,
         uint256 slashId,
         uint256 index
@@ -163,6 +167,7 @@ interface IStrategyManager is IStrategyManagerErrors, IStrategyManagerEvents, IS
     function getBurnOrRedistributableShares(
         OperatorSet calldata operatorSet,
         uint256 slashId
+<<<<<<< HEAD
     ) external view returns (IStrategy[] memory, uint256[] memory);
 
     /**
@@ -189,6 +194,9 @@ interface IStrategyManager is IStrategyManagerErrors, IStrategyManagerEvents, IS
         OperatorSet calldata operatorSet,
         uint256 slashId
     ) external view returns (uint256);
+=======
+    ) external view returns (IStrategy[] memory);
+>>>>>>> b227d922 (chore: format)
 
     /**
      * @notice Owner-only function to change the `strategyWhitelister` address.