Avoid merge conflicts with ui_short.pdf

This commit is contained in:
Jeff Burdges 2016-05-12 12:49:06 +02:00
parent c6f9b09865
commit 311a97081b