Fixed merge issues

pooltogether · Jul 31, 2020 · ce9944d · ce9944d
1 parent 4783573
commit ce9944d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contracts/drip/BalanceDripManager.sol b/contracts/drip/BalanceDripManager.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.6.4;
 
-import "../prize-pool/MappedSinglyLinkedList.sol";
+import "../utils/MappedSinglyLinkedList.sol";
 import "./BalanceDrip.sol";
 
 library BalanceDripManager {
@@ -21,8 +21,8 @@ library BalanceDripManager {
     uint256 measureTotalSupply,
     uint256 currentTime
   ) internal {
-    address currentDripToken = self.activeBalanceDrips[measure].addressMap[MappedSinglyLinkedList.SENTINAL_TOKEN];
-    while (currentDripToken != address(0) && currentDripToken != MappedSinglyLinkedList.SENTINAL_TOKEN) {
+    address currentDripToken = self.activeBalanceDrips[measure].addressMap[MappedSinglyLinkedList.SENTINAL];
+    while (currentDripToken != address(0) && currentDripToken != MappedSinglyLinkedList.SENTINAL) {
       BalanceDrip.State storage dripState = self.balanceDrips[measure][currentDripToken];
       dripState.drip(
         user,

diff --git a/contracts/drip/VolumeDripManager.sol b/contracts/drip/VolumeDripManager.sol
@@ -5,7 +5,7 @@ import "@nomiclabs/buidler/console.sol";
 
 import "../utils/ExtendedSafeCast.sol";
 import "../utils/UInt256Array.sol";
-import "../prize-pool/MappedSinglyLinkedList.sol";
+import "../utils/MappedSinglyLinkedList.sol";
 import "./VolumeDrip.sol";
 
 library VolumeDripManager {