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

---
 moonshot-ui.spec.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/moonshot-ui.spec.in b/moonshot-ui.spec.in
index e227013..7d0a243 100644
--- a/moonshot-ui.spec.in
+++ b/moonshot-ui.spec.in
@@ -1,6 +1,5 @@
 Name:           @PACKAGE@
 Version:        @VERSION@
-<<<<<<< HEAD
 Release:        1%{?dist}
 Summary:        Moonshot Federated Identity User Interface
 
-- 
2.1.4