summaryrefslogtreecommitdiffstats
path: root/.bzr/checkout/conflicts
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2021-03-07 05:57:02 +0100
committerSuren A. Chilingaryan <csa@suren.me>2021-03-07 05:57:02 +0100
commita819050e30bb6906858165796655c0c726843a3f (patch)
tree4cf4a054563f03052c98049c3d45904c3b498e0f /.bzr/checkout/conflicts
downloadbib-a819050e30bb6906858165796655c0c726843a3f.tar.gz
bib-a819050e30bb6906858165796655c0c726843a3f.tar.bz2
bib-a819050e30bb6906858165796655c0c726843a3f.tar.xz
bib-a819050e30bb6906858165796655c0c726843a3f.zip
Collect all relevant references from the latest publications
Diffstat (limited to '.bzr/checkout/conflicts')
-rw-r--r--.bzr/checkout/conflicts1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzr/checkout/conflicts b/.bzr/checkout/conflicts
new file mode 100644
index 0000000..0dc2d3a
--- /dev/null
+++ b/.bzr/checkout/conflicts
@@ -0,0 +1 @@
+BZR conflict list format 1