X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=.topdeps;h=70498c426ccab7de55822101a5f964cc2489ef65;hp=374fc55a7596ef68f9fd86ed3e294587d9e28502;hb=refs%2Fheads%2Fi%2Fnew-update;hpb=b2e44d38a26ac903441a6947f0f4c52610e77b3c

diff --git a/.topdeps b/.topdeps
index 374fc55..70498c4 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-debian/locations
+i/basis-merge