From 88df88a19674ccc0017836941b8ee32eaadf19fb Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Thu, 23 Mar 2017 06:19:54 -0700 Subject: Deleted charms with wrong license. Will source them differently in future. Change-Id: I0fc99ea03c6b6ca4701e63793cb2be60e56c7588 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 1.2.3-korg