aboutsummaryrefslogtreecommitdiffstats
path: root/charms/trusty/cassandra/.bzr/checkout/conflicts
diff options
context:
space:
mode:
authorStuart Mackie <wsmackie@juniper.net>2016-11-22 14:00:39 -0800
committerStuart Mackie <wsmackie@juniper.net>2016-11-22 14:00:39 -0800
commit5de4c9f0c126b984da72128a3ca084eda6b4087a (patch)
tree0be55aa0809cc395e45baeae63db660b4e72fe83 /charms/trusty/cassandra/.bzr/checkout/conflicts
parentf02da72993eb8e5a34ed049bad442c6d6db4701a (diff)
Add local cassandra charm from Tony Liu's machine
Change-Id: I56478233f7498861f95a0c12be983f9a1307853e Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
Diffstat (limited to 'charms/trusty/cassandra/.bzr/checkout/conflicts')
-rw-r--r--charms/trusty/cassandra/.bzr/checkout/conflicts1
1 files changed, 1 insertions, 0 deletions
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