aboutsummaryrefslogtreecommitdiffstats
path: root/charms/trusty/cassandra/.bzr/checkout/conflicts
diff options
context:
space:
mode:
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