diff options
Diffstat (limited to 'charms/trusty/zookeeper/.bzr/checkout/conflicts')
| -rw-r--r-- | charms/trusty/zookeeper/.bzr/checkout/conflicts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/charms/trusty/zookeeper/.bzr/checkout/conflicts b/charms/trusty/zookeeper/.bzr/checkout/conflicts deleted file mode 100644 index 0dc2d3a..0000000 --- a/charms/trusty/zookeeper/.bzr/checkout/conflicts +++ /dev/null @@ -1 +0,0 @@ -BZR conflict list format 1 |