From: Sam Hartman <hartmans@debian.org>
Date: Mon, 23 Jun 2014 16:08:46 +0000 (-0400)
Subject: fix merge conflict
X-Git-Tag: 0.7.1~6
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=8615288ad1f321195dbc3e063bfb6f295fa28cd2

fix merge conflict
---

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