aboutsummaryrefslogtreecommitdiff
path: root/articles
diff options
context:
space:
mode:
authorJeff Burdges <burdges@gnunet.org>2016-05-12 12:49:06 +0200
committerJeff Burdges <burdges@gnunet.org>2016-05-12 12:49:06 +0200
commit311a97081b649dac939bf1efeb9b157cb7d0a937 (patch)
tree3da83ffd143827054c1c06d1db0935340c37bbb5 /articles
parentc6f9b09865f46ded26caf86be9c56087448fa303 (diff)
downloadwallet-core-311a97081b649dac939bf1efeb9b157cb7d0a937.tar.xz
Avoid merge conflicts with ui_short.pdf
Diffstat (limited to 'articles')
-rw-r--r--articles/ui/ui_short-submitted.pdf (renamed from articles/ui/ui_short.pdf)bin123675 -> 123675 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/articles/ui/ui_short.pdf b/articles/ui/ui_short-submitted.pdf
index c423cde96..c423cde96 100644
--- a/articles/ui/ui_short.pdf
+++ b/articles/ui/ui_short-submitted.pdf
Binary files differ