From 5de4c9f0c126b984da72128a3ca084eda6b4087a Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Tue, 22 Nov 2016 14:00:39 -0800 Subject: Add local cassandra charm from Tony Liu's machine Change-Id: I56478233f7498861f95a0c12be983f9a1307853e Signed-off-by: Stuart Mackie --- charms/trusty/cassandra/.bzr/checkout/conflicts | 1 + 1 file changed, 1 insertion(+) create 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 new file mode 100644 index 0000000..0dc2d3a --- /dev/null +++ b/charms/trusty/cassandra/.bzr/checkout/conflicts @@ -0,0 +1 @@ +BZR conflict list format 1 -- cgit 1.2.3-korg