From f02da72993eb8e5a34ed049bad442c6d6db4701a Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Wed, 19 Oct 2016 14:29:38 -0700 Subject: Removed cassandra charm. Will fetch in fetch-charms.sh in joid Change-Id: I668ca30b3b76fc2107045907be5b6010a552e6a9 Signed-off-by: Stuart Mackie --- charms/trusty/cassandra/.bzr/checkout/conflicts | 1 - 1 file changed, 1 deletion(-) delete mode 100644 charms/trusty/cassandra/.bzr/checkout/conflicts (limited to 'charms/trusty/cassandra/.bzr/checkout/conflicts') diff --git a/charms/trusty/cassandra/.bzr/checkout/conflicts b/charms/trusty/cassandra/.bzr/checkout/conflicts deleted file mode 100644 index 0dc2d3a..0000000 --- a/charms/trusty/cassandra/.bzr/checkout/conflicts +++ /dev/null @@ -1 +0,0 @@ -BZR conflict list format 1 -- cgit