From 158af7acfa54ad3f4a18cd8e697efb1341cd7e05 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sun, 2 Dec 2018 18:26:25 +0100
Subject: git subrepo clone --branch=master --force ../cabal-plan

subrepo:
  subdir:   "cabal-plan"
  merged:   "cd93de6"
upstream:
  origin:   "../cabal-plan"
  branch:   "master"
  commit:   "cd93de6"
git-subrepo:
  version:  "0.4.0"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "5d6aba9"
---
 cabal-plan/.gitrepo | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'cabal-plan')

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
-- 
cgit v1.2.3