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: [PATCH] Avoid merge conflicts with ui_short.pdf

---
 .../ui/{ui_short.pdf => ui_short-submitted.pdf}     | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename articles/ui/{ui_short.pdf => ui_short-submitted.pdf} (100%)

diff --git a/articles/ui/ui_short.pdf b/articles/ui/ui_short-submitted.pdf
similarity index 100%
rename from articles/ui/ui_short.pdf
rename to articles/ui/ui_short-submitted.pdf