X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=moonshot-ui.spec.in;h=7d0a243ee1cdcc61fa355fcfb7517bed87974da7;hb=ac5040b32043be491c9c3282054335130be8cbfb;hp=e227013612c070679c64b72101ef2a3c7e50768b;hpb=ea9e814dc5d1c142d006f60c575a0261f247e2b8;p=moonshot-ui.git

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