| Index: dependencies |
| diff --git a/dependencies b/dependencies |
| index d763fef55562c58cc8b86bf3a4a3c36ca0956921..e22da1e6d0b553d049b4db8e728508c0d518806e 100644 |
| --- a/dependencies |
| +++ b/dependencies |
| @@ -2,5 +2,5 @@ _root = hg:https://hg.adblockplus.org/ git:https://github.com/adblockplus/ |
| _self = buildtools/ensure_dependencies.py |
| buildtools = buildtools hg:1b59fbf12b07 git:6a2fb97 |
| adblockplus = adblockplus hg:c8ec667756d3 git:9a42447 |
| -adblockpluscore = adblockpluscore hg:c7ae7532578a git:50ebfcf |
| -adblockplusui = adblockplusui hg:673e908d3bb4 git:1db1e7d |
| +adblockpluscore = adblockpluscore hg:68a4dc4e79e8 git:2574147 |
| +adblockplusui = adblockplusui hg:a78bfd4024b7 git:0feaaf7 |
|
Sebastian Noack
2017/03/23 06:38:37
It seems you did a mistake while rebasing. The las
kzar
2017/03/23 06:51:01
Not a mistake, I rebased before Jon's commit lande
|