aboutsummaryrefslogtreecommitdiff
path: root/cabal-plan/.gitrepo
diff options
context:
space:
mode:
Diffstat (limited to 'cabal-plan/.gitrepo')
-rw-r--r--cabal-plan/.gitrepo7
1 files changed, 4 insertions, 3 deletions
diff --git a/cabal-plan/.gitrepo b/cabal-plan/.gitrepo
index c0cb75b..22e29c4 100644
--- a/cabal-plan/.gitrepo
+++ b/cabal-plan/.gitrepo
@@ -6,6 +6,7 @@
[subrepo]
remote = ../cabal-plan
branch = master
- commit = 34506abf26df4275e8c90771587d152d1c8531f1
- parent = 12e1be31c09161dec1fa70f15ede84ba9965a365
- cmdver = 0.3.1
+ commit = cd93de6ab26a15383ea9bea3005cec486be9af95
+ parent = afed7936ebb2ace14bc93535019b638130b451ab
+ cmdver = 0.4.0
+ method = merge