From cf46e77f28faa0489cfbf90acaf2dc3980d0447d Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Mon, 23 Jun 2014 12:08:58 -0400
Subject: [PATCH] Update ui to fix merge conflict

---
 ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui b/ui
index ea9e814..8615288 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit ea9e814dc5d1c142d006f60c575a0261f247e2b8
+Subproject commit 8615288ad1f321195dbc3e063bfb6f295fa28cd2
-- 
2.1.4