From 311a97081b649dac939bf1efeb9b157cb7d0a937 Mon Sep 17 00:00:00 2001
From: Jeff Burdges <burdges@gnunet.org>
Date: Thu, 12 May 2016 12:49:06 +0200
Subject: Avoid merge conflicts with ui_short.pdf

---
 articles/ui/ui_short-submitted.pdf | Bin 0 -> 123675 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 articles/ui/ui_short-submitted.pdf

(limited to 'articles/ui/ui_short-submitted.pdf')

diff --git a/articles/ui/ui_short-submitted.pdf b/articles/ui/ui_short-submitted.pdf
new file mode 100644
index 000000000..c423cde96
Binary files /dev/null and b/articles/ui/ui_short-submitted.pdf differ
-- 
cgit v1.2.3