From 4faa7f927149a5c4ef7a03523f7bc14523cb9baa Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Fri, 7 Oct 2016 12:24:58 -0700 Subject: Charms for Contrail 3.1 with Mitaka Change-Id: Id37f3b9743d1974e31fcd7cd9c54be41bb0c47fb 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